diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 15:52:48 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-30 15:52:48 +0400 |
| commit | e5ce6d447b952658b8a8568c807baeab5cf58783 (patch) | |
| tree | 74af04c23abf7c610e0e944a7df4c7ca87f67a2f /libavcodec/indeo5.c | |
| parent | 301f6da0397eb8955adf355229521997390d918a (diff) | |
| parent | d05f72c75445969cd7bdb1d860635c9880c67fb6 (diff) | |
Merge commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6'
* commit 'd05f72c75445969cd7bdb1d860635c9880c67fb6':
dfa: improve boundary checks in decode_dds1()
wmalosslessdec: Fix reading too many bits in decode_channel_residues()
wmalosslessdec: fix a get_bits(0) in decode_ac_filter
wmalosslessdec: make MCLMS arrays big enough for what is written into them.
indeo4/5: check empty tile size in decode_mb_info().
ivi_common: make ff_ivi_process_empty_tile() static.
indeo5: check tile size in decode_mb_info().
indeo3: fix out of cell write.
Conflicts:
libavcodec/dfa.c
libavcodec/indeo3.c
libavcodec/indeo5.c
libavcodec/ivi_common.c
libavcodec/wmalosslessdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo5.c')
| -rw-r--r-- | libavcodec/indeo5.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 0a93d1e4c0..fd43e33e9d 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -452,8 +452,8 @@ static int decode_mb_info(IVI45DecContext *ctx, IVIBandDesc *band, ((band->qdelta_present && band->inherit_qdelta) || band->inherit_mv)) return AVERROR_INVALIDDATA; - if( tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size) ){ - av_log(avctx, AV_LOG_ERROR, "allocated tile size %d mismatches parameters %d\n", + if (tile->num_MBs != IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)) { + av_log(avctx, AV_LOG_ERROR, "Allocated tile size %d mismatches parameters %d\n", tile->num_MBs, IVI_MBs_PER_TILE(tile->width, tile->height, band->mb_size)); return AVERROR_INVALIDDATA; } |