diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 03:18:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-28 03:18:21 +0200 |
| commit | e367d90664f622db9f3f1f515ac979bfbd358064 (patch) | |
| tree | 5d231f0ce1922f87fbc1d9029bbe1571aac7f551 /libavformat/aiffdec.c | |
| parent | be862c0dac356dc94451f64469c8abc866d8e00e (diff) | |
| download | ffmpeg-e367d90664f622db9f3f1f515ac979bfbd358064.tar.gz | |
aiffdec: support QDM2
Fixes ticket204
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffdec.c')
| -rw-r--r-- | libavformat/aiffdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 728e1f7e01..a4606a6336 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intreadwrite.h" #include "libavutil/mathematics.h" #include "libavutil/dict.h" #include "avformat.h" @@ -273,6 +274,8 @@ static int aiff_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codec->extradata_size = size; avio_read(pb, st->codec->extradata, size); + if (st->codec->codec_id == AV_CODEC_ID_QDM2 && size>=12*4 && !st->codec->block_align) + st->codec->block_align = AV_RB32(st->codec->extradata+11*4); break; case MKTAG('C','H','A','N'): if(ff_mov_read_chan(s, st, size) < 0) |