diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 23:31:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 23:31:04 +0200 |
| commit | e4c00aca966e0b22777f3d2d6fe9c993151cc5f8 (patch) | |
| tree | 4116ad4fe097fbc05a87e40ed73e9b1b6a4e6fdc /libavformat/aiffdec.c | |
| parent | a8d8e868c6154f63a9229f913434aaa21833e488 (diff) | |
| parent | eeb55f5f2f48dba3cb4530e9c65999471affe26e (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (38 commits)
alac: cosmetics: general pretty-printing and comment clean up
alac: calculate buffer size outside the loop in allocate_buffers()
alac: change some data types to plain int
alac: cosmetics: rename some variables and function names
alac: multi-channel decoding support
alac: split element parsing into a separate function
alac: support a read sample size of up to 32
alac: output in planar sample format
alac: add 32-bit decoding support
alac: simplify channel interleaving
alac: use AVPacket fields directly in alac_decode_frame()
alac: fix check for valid max_samples_per_frame
alac: use get_sbits() to read LPC coefficients instead of casting
alac: move the current samples per frame to the ALACContext
alac: avoid using a double-negative when checking if the frame is compressed
alac: factor out output_size check in predictor_decompress_fir_adapt()
alac: factor out loading of next decoded sample in LPC prediction
alac: use index into buffer_out instead of incrementing the pointer
alac: simplify lpc coefficient adaptation
alac: reduce the number of local variables needed in lpc prediction
...
Conflicts:
libavcodec/alac.c
libavformat/cafdec.c
libavformat/mov.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aiffdec.c')
| -rw-r--r-- | libavformat/aiffdec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 3382e8a4c1..f89ed93dd5 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -275,9 +275,8 @@ static int aiff_read_header(AVFormatContext *s) avio_read(pb, st->codec->extradata, size); break; case MKTAG('C','H','A','N'): - if (size < 12) + if(ff_mov_read_chan(s, st, size) < 0) return AVERROR_INVALIDDATA; - ff_mov_read_chan(s, size, st->codec); break; default: /* Jump */ if (size & 1) /* Always even aligned */ |