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

[Moritz Bunkus CVS]

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

Modified Files:
	demux_mkv.cpp 
Log Message:
More liberal codec id recognition for AC3 codecs (needed for transcoded DNET from RM).

Index: demux_mkv.cpp
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- demux_mkv.cpp	2 Oct 2003 19:02:28 -0000	1.35
+++ demux_mkv.cpp	14 Oct 2003 13:45:31 -0000	1.36
@@ -709,7 +709,7 @@
         } else {
           if (!strcmp(t->codec_id, MKV_A_MP3))
             t->a_formattag = 0x0055;
-          else if (!strcmp(t->codec_id, MKV_A_AC3))
+          else if (!strncmp(t->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)))
             t->a_formattag = 0x2000;
           else if (!strcmp(t->codec_id, MKV_A_DTS))
             // uses same format tag as AC3, only supported with -hwac3
@@ -1754,7 +1754,7 @@
       sh_a->wf->wBitsPerSample = 0;
       sh_a->samplesize = 0;
 
-    } else if (!strcmp(track->codec_id, MKV_A_AC3)) {
+    } else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) {
       sh_a->wf->nAvgBytesPerSec = 16000;
       sh_a->wf->nBlockAlign = 1536;
       sh_a->wf->wBitsPerSample = 0;