[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.cpp,1.52,1.53

[Moritz Bunkus CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/scsi/2/tmp/cvs-serv5273

Modified Files:
	demux_mkv.cpp 
Log Message:
Added more legacy CodecIDs (S_ASS).

Index: demux_mkv.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- demux_mkv.cpp	11 Jan 2004 13:31:32 -0000	1.52
+++ demux_mkv.cpp	11 Jan 2004 13:36:53 -0000	1.53
@@ -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;