diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:18:42 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:18:42 +0200 |
| commit | 0269d22d32fb380e7128ca0c60f6f1638c6dab70 (patch) | |
| tree | 53ba64153d9ef930f73458138478a6d0def381ce /libmpdemux | |
| parent | 240550bbb94653907faa6e0bb1c5ac3d279cc252 (diff) | |
| parent | 97ef28ad9aa2f34aea0779062976ad4294c0af51 (diff) | |
| download | mpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.bz2 mpv-0269d22d32fb380e7128ca0c60f6f1638c6dab70.tar.xz | |
Merge svn changes up to r30876
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 adfe1059b2..7fc68db5f9 100644 --- a/libmpdemux/mp_taglists.c +++ b/libmpdemux/mp_taglists.c @@ -27,6 +27,7 @@ static const struct mp_AVCodecTag mp_wav_tags[] = { { CODEC_ID_ADPCM_4XM, MKTAG('4', 'X', 'M', 'A')}, + { CODEC_ID_ADPCM_ADX, MKTAG('S', 'a', 'd', 'x')}, { CODEC_ID_ADPCM_EA, MKTAG('A', 'D', 'E', 'A')}, { CODEC_ID_ADPCM_EA_MAXIS_XA, MKTAG('A', 'D', 'X', 'A')}, { CODEC_ID_ADPCM_IMA_WS, MKTAG('A', 'I', 'W', 'S')}, |