summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:44:57 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 23:44:57 +0200
commit89c5ed5e9a720b032af9a58263deda158e1cbf4d (patch)
tree2afd33bf8cd2692201b78a0a2da80824780efc63 /libmpdemux
parent0670a5d0905db1e4bbf376cf005ca836f4d0e04b (diff)
parentcdd0ab0da9818aeb527e35fe73ee57bdf3aa4f70 (diff)
downloadmpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.bz2
mpv-89c5ed5e9a720b032af9a58263deda158e1cbf4d.tar.xz
Merge svn changes up to r30605
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/mp_taglists.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/mp_taglists.c b/libmpdemux/mp_taglists.c
index 4b7c8ed331..eab8316e02 100644
--- a/libmpdemux/mp_taglists.c
+++ b/libmpdemux/mp_taglists.c
@@ -39,6 +39,7 @@ static const struct mp_AVCodecTag mp_wav_tags[] = {
{ CODEC_ID_INTERPLAY_DPCM, MKTAG('I', 'N', 'P', 'A')},
{ CODEC_ID_MLP, MKTAG('M', 'L', 'P', ' ')},
{ CODEC_ID_MP1, 0x50},
+ { CODEC_ID_MP4ALS, MKTAG('A', 'L', 'S', ' ')},
{ CODEC_ID_MUSEPACK7, MKTAG('M', 'P', 'C', ' ')},
{ CODEC_ID_MUSEPACK8, MKTAG('M', 'P', 'C', '8')},
{ CODEC_ID_NELLYMOSER, MKTAG('N', 'E', 'L', 'L')},