Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged 2001

Browse Source
This commit is contained in:
Moritz Bunkus 2004-08-20 16:56:32 +00:00
parent d995e8fad2
commit c3310655f5
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-20 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: bug fix: SSA/ASS subs with the old codec ID 'S_SSA'
and 'S_ASS' were accepted, but their codec ID was kept. It is now
correctly changed to 'S_TEXT/SSA' and 'S_TEXT/ASS'.
2004-08-19 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge, mkvinfo, mkvextract: new feature: Added support for

12
src/input/r_matroska.cpp
View File

@ -1638,12 +1638,18 @@ kax_reader_c::create_packetizer(int64_t tid) {
t->sub_type = 'v';
} else if (!strncmp(t->codec_id, "S_TEXT", 6) ||
!strcmp(t->codec_id, MKV_S_TEXTASS) ||
!strcmp(t->codec_id, MKV_S_TEXTSSA) ||
!strcmp(t->codec_id, "S_SSA") ||
!strcmp(t->codec_id, "S_ASS")) {
string new_codec_id;
if (!strcmp(t->codec_id, "S_SSA") ||
!strcmp(t->codec_id, "S_ASS"))
new_codec_id = string("S_TEXT/") + string(&t->codec_id[2]);
else
new_codec_id = t->codec_id;
t->ptzr =
add_packetizer(new textsubs_packetizer_c(this, t->codec_id,
add_packetizer(new textsubs_packetizer_c(this,
new_codec_id.c_str(),
t->private_data,
t->private_size, false,
true, nti));