add support for S_ASS and S_SSA codec string
authorAurelien Jacobs <aurel@gnuage.org>
Mon, 16 Jul 2007 14:51:43 +0000 (14:51 +0000)
committerAurelien Jacobs <aurel@gnuage.org>
Mon, 16 Jul 2007 14:51:43 +0000 (14:51 +0000)
Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/matroska.c
libavformat/matroskadec.c

index bac2628..801e8fe 100644 (file)
@@ -63,6 +63,8 @@ CodecTags ff_mkv_codec_tags[]={
     {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , CODEC_ID_TEXT},
     {"S_TEXT/SSA"       , CODEC_ID_TEXT},
     {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
     {"S_TEXT/ASS"       , CODEC_ID_TEXT},
     {"S_TEXT/SSA"       , CODEC_ID_TEXT},
+    {"S_ASS"            , CODEC_ID_TEXT},
+    {"S_SSA"            , CODEC_ID_TEXT},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
     {NULL               , CODEC_ID_NONE}
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
     {NULL               , CODEC_ID_NONE}
index b7d8cd6..532ccd8 100644 (file)
@@ -2147,7 +2147,9 @@ matroska_read_header (AVFormatContext    *s,
             else if (codec_id == CODEC_ID_TEXT) {
                 MatroskaSubtitleTrack *subtrack=(MatroskaSubtitleTrack *)track;
                 if (!strcmp(track->codec_id, "S_TEXT/ASS") ||
             else if (codec_id == CODEC_ID_TEXT) {
                 MatroskaSubtitleTrack *subtrack=(MatroskaSubtitleTrack *)track;
                 if (!strcmp(track->codec_id, "S_TEXT/ASS") ||
-                    !strcmp(track->codec_id, "S_TEXT/SSA"))
+                    !strcmp(track->codec_id, "S_TEXT/SSA") ||
+                    !strcmp(track->codec_id, "S_ASS") ||
+                    !strcmp(track->codec_id, "S_SSA"))
                     subtrack->ass = 1;
             }
 
                     subtrack->ass = 1;
             }