diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 14:34:56 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-01-25 14:34:56 +0200 |
commit | 47a04d40f35a02a64f8410ee684affc5f0af894f (patch) | |
tree | a32a4f9d4901a6a1ca1a8a763627cd795ab5fb3d /libmpdemux | |
parent | ffc3db22395b2a505e2f9ef6e805650c9b375731 (diff) | |
parent | a91c19964de606c8002531cbb87aa6de3d89508f (diff) | |
download | mpv-47a04d40f35a02a64f8410ee684affc5f0af894f.tar.bz2 mpv-47a04d40f35a02a64f8410ee684affc5f0af894f.tar.xz |
Merge svn changes up to r30250
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/mp_taglists.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c index d40c17c34c..4b7c8ed331 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -38,6 +38,7 @@ static const struct mp_AVCodecTag mp_wav_tags[] = { { CODEC_ID_EAC3, MKTAG('E', 'A', 'C', '3')}, { CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')}, { CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')}, + { CODEC_ID_MP1, 0x50}, { CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')}, { CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')}, { CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')}, |