summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mkv.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-03-31 02:20:02 +0300
committerUoti Urpala <uau@mplayer2.org>2011-03-31 03:44:37 +0300
commit993bc6a83fbec9dc6241b5e6d6dd8bebd5347c18 (patch)
tree861902ed97814546ee0550ae9c0c75259218b245 /libmpdemux/demux_mkv.c
parentcb4394aea32b126e410cc436aae9588cde140147 (diff)
downloadmpv-993bc6a83fbec9dc6241b5e6d6dd8bebd5347c18.tar.bz2
mpv-993bc6a83fbec9dc6241b5e6d6dd8bebd5347c18.tar.xz
demux_mkv: support E-AC-3 audio
Recognize "A_EAC3" CodecID.
Diffstat (limited to 'libmpdemux/demux_mkv.c')
-rw-r--r--libmpdemux/demux_mkv.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index 7432b59d46..58570855ae 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -1317,6 +1317,8 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track,
track->a_formattag = 0x0055;
else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)))
track->a_formattag = 0x2000;
+ else if (!strncmp(track->codec_id, MKV_A_EAC3, strlen(MKV_A_EAC3)))
+ track->a_formattag = mmioFOURCC('E', 'A', 'C', '3');
else if (!strcmp(track->codec_id, MKV_A_DTS))
track->a_formattag = 0x2001;
else if (!strcmp(track->codec_id, MKV_A_PCM)
@@ -1390,6 +1392,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track,
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;