Merged 2176

This commit is contained in:
Moritz Bunkus 2004-09-16 15:29:38 +00:00
parent ba33221a0e
commit 286d198238
2 changed files with 3 additions and 1 deletions

View File

@ -58,6 +58,7 @@
#define MKV_S_TEXTSSA "S_TEXT/SSA"
#define MKV_S_TEXTASS "S_TEXT/ASS"
#define MKV_S_TEXTUSF "S_TEXT/USF"
#define MKV_S_TEXTASCII "S_TEXT/ASCII"
#define MKV_S_VOBSUB "S_VOBSUB"
#define MKV_S_VOBSUBZLIB "S_VOBSUB/ZLIB"

View File

@ -368,7 +368,8 @@ check_output_files() {
}
} else if (tracks[i].track_type == 's') {
if (!strcmp(tracks[i].codec_id, MKV_S_TEXTUTF8))
if (!strcmp(tracks[i].codec_id, MKV_S_TEXTUTF8) ||
!strcmp(tracks[i].codec_id, MKV_S_TEXTASCII))
tracks[i].type = TYPESRT;
else if (!strcmp(tracks[i].codec_id, MKV_S_TEXTSSA) ||
!strcmp(tracks[i].codec_id, MKV_S_TEXTASS) ||