diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 02:49:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-21 04:25:11 +0200 |
| commit | 3c033d00f5990e48b14f962d33c362f76695fb07 (patch) | |
| tree | 261e11fc02302638fd451f9f0d3741fc444cc28c /libavformat/cafdec.c | |
| parent | 85761efa95fd7cfb104fb862a242691d4e7c345c (diff) | |
| parent | ce64e5bfd11ae63af0fb10317a2aea6f7501be62 (diff) | |
| download | ffmpeg-3c033d00f5990e48b14f962d33c362f76695fb07.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopenjpeg: introduce lowres and lowqual private options
FATE: add a test for flac cover art.
cafdec: allow larger ALAC magic cookie
alac: fix channel pointer assignment for 24 and 32-bit
Conflicts:
libavcodec/alac.c
libavcodec/libopenjpegdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cafdec.c')
| -rw-r--r-- | libavformat/cafdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 0dacf2c4f1..15b3a8ffcf 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -124,7 +124,7 @@ static int read_kuki_chunk(AVFormatContext *s, int64_t size) #define ALAC_HEADER 36 #define ALAC_NEW_KUKI 24 uint8_t preamble[12]; - if (size < ALAC_NEW_KUKI || size > ALAC_PREAMBLE + ALAC_HEADER) { + if (size < ALAC_NEW_KUKI) { av_log(s, AV_LOG_ERROR, "invalid ALAC magic cookie\n"); avio_skip(pb, size); return AVERROR_INVALIDDATA; |