# HG changeset patch # User cehoyos # Date 1300918114 0 # Node ID e9a733c1e2a1ad927b27d2150eca044d0ffc2ebf # Parent fafbc46915db88c06400b7b6ca0e8411ae3d0822 Support E-AC3 in deprecated native matroska demuxer. diff -r fafbc46915db -r e9a733c1e2a1 libmpdemux/demux_mkv.c --- a/libmpdemux/demux_mkv.c Wed Mar 23 14:52:13 2011 +0000 +++ b/libmpdemux/demux_mkv.c Wed Mar 23 22:08:34 2011 +0000 @@ -1677,6 +1677,8 @@ 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 @@ 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; diff -r fafbc46915db -r e9a733c1e2a1 libmpdemux/matroska.h --- a/libmpdemux/matroska.h Wed Mar 23 14:52:13 2011 +0000 +++ b/libmpdemux/matroska.h Wed Mar 23 22:08:34 2011 +0000 @@ -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"