[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.cpp,1.41,1.42

[Attila Kinali CVS]

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

Modified Files:
	demux_mkv.cpp 
Log Message:
10!
someone please tell me how subs ever worked with mkv


Index: demux_mkv.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- demux_mkv.cpp	25 Oct 2003 12:42:24 -0000	1.41
+++ demux_mkv.cpp	26 Oct 2003 12:28:45 -0000	1.42
@@ -2357,10 +2357,10 @@
                                                     sizeof(mkv_sh_sub_t));
       demuxer->sub->id = track->xid;
 
-    } else if (strcmp(track->codec_id, MKV_S_TEXTASCII) &&
+    } else 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, "S_SSA"))
+               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 {