diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 12:42:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 12:43:45 +0200 |
| commit | 8c0bb195220d9dc7b46701519cc1a617ddbba0b8 (patch) | |
| tree | 38efa3ea89983b3707eeb85047ea5d4afab9a45a /libavcodec/indeo4.c | |
| parent | 54623619373d316136d184153d0d7387acef6426 (diff) | |
| parent | 6255ccf7d51c82ab79bf0cd47a921f572dda4489 (diff) | |
| download | ffmpeg-8c0bb195220d9dc7b46701519cc1a617ddbba0b8.tar.gz | |
Merge commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489'
* commit '6255ccf7d51c82ab79bf0cd47a921f572dda4489':
indeo4: Check the quantization matrix index
Conflicts:
libavcodec/indeo4.c
See: 8a20774a24bb1ea68b7360113746eac6e59ad8a8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index dafba38f4b..7e69b9d1aa 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -371,8 +371,9 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, av_log(avctx, AV_LOG_ERROR, "Custom quant matrix encountered!\n"); return AVERROR_INVALIDDATA; } - if (quant_mat > 21) { - av_log(avctx, AV_LOG_ERROR, "Invalid quant matrix encountered!\n"); + if (quant_mat >= FF_ARRAY_ELEMS(quant_index_to_tab)) { + avpriv_request_sample(avctx, "Quantization matrix %d", + quant_mat); return AVERROR_INVALIDDATA; } band->quant_mat = quant_mat; |