summaryrefslogtreecommitdiff
path: root/libavformat/aiff.h
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2015-11-07 00:35:51 +0100
committerVittorio Giovara <vittorio.giovara@gmail.com>2015-11-12 04:39:14 +0100
commit73b03249133d6631520089798087cbd963eed9ca (patch)
treeda14cea150ea3343951a7a636c36c05f4b6d7a4b /libavformat/aiff.h
parent5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c (diff)
aiff: Support demuxing G.722 streams
Diffstat (limited to 'libavformat/aiff.h')
-rw-r--r--libavformat/aiff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/aiff.h b/libavformat/aiff.h
index f88f957e71..4ed135b765 100644
--- a/libavformat/aiff.h
+++ b/libavformat/aiff.h
@@ -42,6 +42,7 @@ static const AVCodecTag ff_codec_aiff_tags[] = {
{ AV_CODEC_ID_MACE3, MKTAG('M','A','C','3') },
{ AV_CODEC_ID_MACE6, MKTAG('M','A','C','6') },
{ AV_CODEC_ID_GSM, MKTAG('G','S','M',' ') },
+ { AV_CODEC_ID_ADPCM_G722, MKTAG('G','7','2','2') },
{ AV_CODEC_ID_ADPCM_G726, MKTAG('G','7','2','6') },
{ AV_CODEC_ID_PCM_S16BE, MKTAG('t','w','o','s') },
{ AV_CODEC_ID_PCM_S16LE, MKTAG('s','o','w','t') },