[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.cpp,1.34,1.35

[Moritz Bunkus CVS]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv5606

Modified Files:
	demux_mkv.cpp 
Log Message:
Backwards compatibility fix for old SSA CodecIDs.

Index: demux_mkv.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- demux_mkv.cpp	22 Sep 2003 13:53:29 -0000	1.34
+++ demux_mkv.cpp	2 Oct 2003 19:02:28 -0000	1.35
@@ -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