summaryrefslogtreecommitdiffstats
path: root/demux
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-11-23 15:55:22 +0100
committerwm4 <wm4@nowhere>2016-11-23 15:57:35 +0100
commit79d99bd264d53aac2fe7a3c07cf36b3710a5b726 (patch)
tree1c61fae7702ac2f3e7ec12a5fdf1bfaee66bdeaf /demux
parentf9668f55968f925d21fd98ff11842ea61e9890c4 (diff)
downloadmpv-79d99bd264d53aac2fe7a3c07cf36b3710a5b726.tar.bz2
mpv-79d99bd264d53aac2fe7a3c07cf36b3710a5b726.tar.xz
demux_mkv: distinguish mp2 and mp3
demux_mkv.c has returned mp3 for mp2 since the initial commit. Normally not a problem.
Diffstat (limited to 'demux')
-rw-r--r--demux/demux_mkv.c6
1 files changed, 4 insertions, 2 deletions
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;