aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/riff.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2012-11-21 15:29:15 +0000
committerPaul B Mahol <onemda@gmail.com>2012-11-24 10:56:47 +0000
commit3d8e684f0592603a91a2f33e68ae1934148f7d81 (patch)
tree474e3f5173807ebed237d26019a7c68bc9bc056b /libavformat/riff.c
parented591ed842dad0e23e7ba83d854faa61d2e2eb0f (diff)
downloadffmpeg-3d8e684f0592603a91a2f33e68ae1934148f7d81.tar.gz
ADPCM IMA Dialogic decoder
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavformat/riff.c')
-rw-r--r--libavformat/riff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c
index 9a37760b41..bae7f8aea0 100644
--- a/libavformat/riff.c
+++ b/libavformat/riff.c
@@ -338,8 +338,10 @@ const AVCodecTag ff_codec_wav_tags[] = {
{ AV_CODEC_ID_PCM_ALAW, 0x0006 },
{ AV_CODEC_ID_PCM_MULAW, 0x0007 },
{ AV_CODEC_ID_WMAVOICE, 0x000A },
+ { AV_CODEC_ID_ADPCM_IMA_OKI, 0x0010 },
{ AV_CODEC_ID_ADPCM_IMA_WAV, 0x0011 },
{ AV_CODEC_ID_PCM_ZORK, 0x0011 }, /* must come after adpcm_ima_wav in this list */
+ { AV_CODEC_ID_ADPCM_IMA_OKI, 0x0017 },
{ AV_CODEC_ID_ADPCM_YAMAHA, 0x0020 },
{ AV_CODEC_ID_TRUESPEECH, 0x0022 },
{ AV_CODEC_ID_GSM_MS, 0x0031 },