From 79d99bd264d53aac2fe7a3c07cf36b3710a5b726 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 23 Nov 2016 15:55:22 +0100 Subject: demux_mkv: distinguish mp2 and mp3 demux_mkv.c has returned mp3 for mp2 since the initial commit. Normally not a problem. --- demux/demux_mkv.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'demux') diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 63b58cdb15..5598cf8374 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -1511,7 +1511,7 @@ static void parse_flac_chmap(struct mp_chmap *channels, unsigned char *data, } static const char *const mkv_audio_tags[][2] = { - { "A_MPEG/L2", "mp3" }, + { "A_MPEG/L2", "mp2" }, { "A_MPEG/L3", "mp3" }, { "A_AC3", "ac3" }, { "A_EAC3", "eac3" }, @@ -1701,7 +1701,9 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track) mp_chmap_set_unknown(&sh_a->channels, track->a_channels); const char *codec = sh_a->codec; - if (!strcmp(codec, "mp3") || !strcmp(codec, "truehd")) { + if (!strcmp(codec, "mp2") || !strcmp(codec, "mp3") || + !strcmp(codec, "truehd")) + { track->parse = true; } else if (!strcmp(codec, "flac")) { unsigned char *ptr = extradata; -- cgit v1.2.3