Mercurial > libavformat.hg

changeset 2264:e48ed322f893 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add support for S_ASS and S_SSA codec string
author aurel
date Mon, 16 Jul 2007 14:51:43 +0000
parents f13dad8ba721
children 00cdb026030f
files matroska.c matroskadec.c
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/matroska.c	Mon Jul 16 10:56:40 2007 +0000
+++ b/matroska.c	Mon Jul 16 14:51:43 2007 +0000
@@ -63,6 +63,8 @@
     {"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}
--- a/matroskadec.c	Mon Jul 16 10:56:40 2007 +0000
+++ b/matroskadec.c	Mon Jul 16 14:51:43 2007 +0000
@@ -2147,7 +2147,9 @@
             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;
             }