diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-09 01:10:36 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-06-09 01:10:36 +0200 |
| commit | c153ea4756ce41b9d09f864972b3bffe0ac0b8d4 (patch) | |
| tree | 11063ff188c92c5e8fefc8be513f2de4c10aa2e9 /libavformat/aiffdec.c | |
| parent | b77e58aad331e81623013f6476ae366d5d2e80ee (diff) | |
| download | ffmpeg-c153ea4756ce41b9d09f864972b3bffe0ac0b8d4.tar.gz | |
Support decoding G.722 in aiff.
Diffstat (limited to 'libavformat/aiffdec.c')
| -rw-r--r-- | libavformat/aiffdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 62af3dca7b..851091e5cb 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -141,6 +141,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; |