Mercurial > mplayer.hg

changeset 10984:e5f2765c6d80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Backwards compatibility fix for old SSA CodecIDs.
author mosu
date Thu, 02 Oct 2003 19:02:28 +0000
parents 590355444f47
children c041999a8d5b
files libmpdemux/demux_mkv.cpp
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.cpp	Thu Oct 02 15:40:15 2003 +0000
+++ b/libmpdemux/demux_mkv.cpp	Thu Oct 02 19:02:28 2003 +0000
@@ -1900,7 +1900,8 @@
   if (track) {
     if (strcmp(track->codec_id, MKV_S_TEXTASCII) &&
         strcmp(track->codec_id, MKV_S_TEXTUTF8) && 
-        strcmp(track->codec_id, MKV_S_TEXTSSA))
+        strcmp(track->codec_id, MKV_S_TEXTSSA) &&
+        strcmp(track->codec_id, "S_SSA"))
       mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not "
              "supported. Track will not be displayed.\n", track->codec_id);
     else {
@@ -1913,7 +1914,8 @@
 
         if (!strcmp(track->codec_id, MKV_S_TEXTUTF8))
           sub_utf8 = 1;       // Force UTF-8 conversion.
-        if (!strcmp(track->codec_id, MKV_S_TEXTSSA)) {
+        if (!strcmp(track->codec_id, MKV_S_TEXTSSA) ||
+            !strcmp(track->codec_id, "S_SSA")) {
           mkv_d->subtitle_type = MKV_SUBTYPE_SSA;
           sub_utf8 = 1;
         } else