[SCM] libav/experimental: add support for S_ASS and S_SSA codec string

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit ee8c87b55bcd53f273e1abd890dccd97e378d3fb
Author: Aurelien Jacobs <aurel at gnuage.org>
Date:   Mon Jul 16 14:51:43 2007 +0000

    add support for S_ASS and S_SSA codec string
    
    Originally committed as revision 9704 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/matroska.c b/libavformat/matroska.c
index bac2628..801e8fe 100644
--- a/libavformat/matroska.c
+++ b/libavformat/matroska.c
@@ -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_ASS"            , CODEC_ID_TEXT},
+    {"S_SSA"            , CODEC_ID_TEXT},
     {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
 
     {NULL               , CODEC_ID_NONE}
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index b7d8cd6..532ccd8 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -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") ||
-                    !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;
             }
 

-- 
Libav/FFmpeg packaging