diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 14:20:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-14 14:20:42 +0200 |
| commit | 76d0a6656bbfa2d43c2ef773d9b17562e60f7ed1 (patch) | |
| tree | 62bdc713b7d44e713cf7db9efd9c5c872d1da60f /libavcodec | |
| parent | a8e5fac1fb3fddeea829648139aa345af9cdc16c (diff) | |
| download | ffmpeg-76d0a6656bbfa2d43c2ef773d9b17562e60f7ed1.tar.gz | |
indeo: print errors if transform and block size mismatch
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/indeo4.c | 4 | ||||
| -rw-r--r-- | libavcodec/indeo5.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 474140e641..81a30ac4f3 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -358,8 +358,10 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, else band->transform_size = 4; - if (band->blk_size != band->transform_size) + if (band->blk_size != band->transform_size) { + av_log(avctx, AV_LOG_ERROR, "transform and block size mismatch (%d != %d)\n", band->transform_size, band->blk_size); return AVERROR_INVALIDDATA; + } scan_indx = get_bits(&ctx->gb, 4); if (scan_indx == 15) { diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 5d5bec8626..4039c0a384 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -191,8 +191,10 @@ static int decode_gop_header(IVI45DecContext *ctx, AVCodecContext *avctx) band->is_2d_trans = band->inv_transform == ff_ivi_inverse_slant_8x8 || band->inv_transform == ff_ivi_inverse_slant_4x4; - if (band->transform_size != band->blk_size) + if (band->transform_size != band->blk_size) { + av_log(avctx, AV_LOG_ERROR, "transform and block size mismatch (%d != %d)\n", band->transform_size, band->blk_size); return AVERROR_INVALIDDATA; + } /* select dequant matrix according to plane and band number */ if (!p) { |