summaryrefslogtreecommitdiff
path: root/libavformat/aiffdec.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-10-18 19:53:47 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-10-18 19:53:47 +0200
commit9860fb445a90fdfbeaa6e66e813eae3031236ad0 (patch)
tree90288e9d6136961b19652f9933377f72e62de250 /libavformat/aiffdec.c
parent6e65e3483706d969d176909fae9e216919f59277 (diff)
downloadffmpeg-9860fb445a90fdfbeaa6e66e813eae3031236ad0.tar.gz
Fix decoding of G.726 in AIFF.
Fixes ticket #1973.
Diffstat (limited to 'libavformat/aiffdec.c')
-rw-r--r--libavformat/aiffdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c
index 2883713253..6f82d9339a 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -141,6 +141,8 @@ 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_G726LE:
+ codec->bits_per_coded_sample = 5;
case AV_CODEC_ID_ADPCM_G722:
case AV_CODEC_ID_MACE6:
codec->block_align = 1*codec->channels;