[MPlayer-cvslog] r33098 - in trunk/libmpdemux: demux_mkv.c matroska.h

[cehoyos]

Author: cehoyos
Date: Wed Mar 23 23:08:34 2011
New Revision: 33098

Log:
Support E-AC3 in deprecated native matroska demuxer.

Modified:
   trunk/libmpdemux/demux_mkv.c
   trunk/libmpdemux/matroska.h

Modified: trunk/libmpdemux/demux_mkv.c
==============================================================================
--- trunk/libmpdemux/demux_mkv.c	Wed Mar 23 15:52:13 2011	(r33097)
+++ trunk/libmpdemux/demux_mkv.c	Wed Mar 23 23:08:34 2011	(r33098)
@@ -1677,6 +1677,8 @@ static int demux_mkv_open_audio(demuxer_
             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_EAC3))
+            track->a_formattag = mmioFOURCC('E', 'A', 'C', '3');
         else if (!strcmp(track->codec_id, MKV_A_PCM)
                  || !strcmp(track->codec_id, MKV_A_PCM_BE))
             track->a_formattag = 0x0001;
@@ -1746,6 +1748,7 @@ static int demux_mkv_open_audio(demuxer_
         sh_a->wf->nAvgBytesPerSec = 16000;
         sh_a->wf->nBlockAlign = 1152;
     } else if ((track->a_formattag == 0x2000) ||        /* AC3 */
+               (track->a_formattag == mmioFOURCC('E', 'A', 'C', '3')) ||
                (track->a_formattag == 0x2001)) {        /* DTS */
         free(sh_a->wf);
         sh_a->wf = NULL;

Modified: trunk/libmpdemux/matroska.h
==============================================================================
--- trunk/libmpdemux/matroska.h	Wed Mar 23 15:52:13 2011	(r33097)
+++ trunk/libmpdemux/matroska.h	Wed Mar 23 23:08:34 2011	(r33098)
@@ -35,6 +35,7 @@
 #define MKV_A_AAC        "A_AAC"
 #define MKV_A_AC3        "A_AC3"
 #define MKV_A_DTS        "A_DTS"
+#define MKV_A_EAC3       "A_EAC3"
 #define MKV_A_MP2        "A_MPEG/L2"
 #define MKV_A_MP3        "A_MPEG/L3"
 #define MKV_A_PCM        "A_PCM/INT/LIT"