summaryrefslogtreecommitdiff
path: root/libavformat/aiffdec.c
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/aiffdec.c
parent5f2c8315b3c1b28da0386fddb118ad6a0ed77a0c (diff)
aiff: Support demuxing G.722 streams
Diffstat (limited to 'libavformat/aiffdec.c')
-rw-r--r--libavformat/aiffdec.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 04cca5d451..fc0b7ebf81 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -136,6 +136,7 @@ static unsigned int get_aiff_header(AVFormatContext *s, int size,
case AV_CODEC_ID_MACE3:
codec->block_align = 2*codec->channels;
break;
+ case AV_CODEC_ID_ADPCM_G722:
case AV_CODEC_ID_MACE6:
codec->block_align = 1*codec->channels;
break;