[Mplayer-cvslog] CVS: main/libmpdemux demux_mkv.c,1.26,1.27

[Moritz Bunkus CVS]

CVS change done by Moritz Bunkus CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv14682

Modified Files:
	demux_mkv.c 
Log Message:
DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ecce ! se)

Index: demux_mkv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- demux_mkv.c	28 Sep 2004 13:51:20 -0000	1.26
+++ demux_mkv.c	30 Oct 2004 08:47:04 -0000	1.27
@@ -1690,9 +1690,10 @@
       if (!strcmp(track->codec_id, MKV_A_MP3) ||
           !strcmp(track->codec_id, MKV_A_MP2))
         track->a_formattag = 0x0055;
-      else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)) ||
-               !strcmp(track->codec_id, MKV_A_DTS))
+      else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)))
         track->a_formattag = 0x2000;
+      else if (!strcmp(track->codec_id, MKV_A_DTS))
+        track->a_formattag = 0x2001;
       else if (!strcmp(track->codec_id, MKV_A_PCM) ||
                !strcmp(track->codec_id, MKV_A_PCM_BE))
         track->a_formattag = 0x0001;
@@ -1810,7 +1811,8 @@
       sh_a->wf->nAvgBytesPerSec = 16000;
       sh_a->wf->nBlockAlign = 1152;
     }
-  else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)))
+  else if ((track->a_formattag == 0x2000) || /* AC3 */
+           (track->a_formattag == 0x2001)) /* DTS */
     {
       sh_a->wf->nAvgBytesPerSec = 16000;
       sh_a->wf->nBlockAlign = 1536;