Mercurial > mplayer.hg

changeset 11774:28b52087c48d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added more legacy CodecIDs (S_ASS).
author mosu
date Sun, 11 Jan 2004 13:36:53 +0000
parents 060b6c86cf31
children 66e491c35dc8
files libmpdemux/demux_mkv.cpp
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mkv.cpp	Sun Jan 11 13:31:32 2004 +0000
+++ b/libmpdemux/demux_mkv.cpp	Sun Jan 11 13:36:53 2004 +0000
@@ -2461,6 +2461,7 @@
                strcmp(track->codec_id, MKV_S_TEXTUTF8) && 
                strcmp(track->codec_id, MKV_S_TEXTSSA) &&
                strcmp(track->codec_id, "S_SSA") &&
+               strcmp(track->codec_id, "S_ASS") &&
                strcmp(track->codec_id, "S_TEXT/ASS"))
       mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Subtitle type '%s' is not "
              "supported. Track will not be displayed.\n", track->codec_id);
@@ -2476,6 +2477,7 @@
           sub_utf8 = 1;       // Force UTF-8 conversion.
         if (!strcmp(track->codec_id, MKV_S_TEXTSSA) ||
             !strcmp(track->codec_id, "S_SSA") ||
+            !strcmp(track->codec_id, "S_ASS") ||
             !strcmp(track->codec_id, "S_TEXT/ASS")) {
           mkv_d->subtitle_type = MKV_SUBTYPE_SSA;
           sub_utf8 = 1;