diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 13:58:38 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-15 13:58:38 +0200 |
| commit | c4b904caeaa7664870030c3015e1593f90112c9c (patch) | |
| tree | 0bb83e80faa9f924a40f4b4656cecb40ae7a41a1 /libavcodec/ivi_common.c | |
| parent | 8e4ecd8774d0841140d4e52e84f6f196c7a7dcfc (diff) | |
| parent | f9e5261cab067be7278f73d515bc9b601eb56202 (diff) | |
| download | ffmpeg-c4b904caeaa7664870030c3015e1593f90112c9c.tar.gz | |
Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
* commit 'f9e5261cab067be7278f73d515bc9b601eb56202':
indeo: Do not reference mismatched tiles
Conflicts:
libavcodec/ivi_common.c
See: dab70c62d20081bcf879b7b6bc3ffabc2e331542
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ivi_common.c')
| -rw-r--r-- | libavcodec/ivi_common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index 14726b38b3..7577729653 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -342,11 +342,11 @@ static int ivi_init_tiles(IVIBandDesc *band, IVITile *ref_tile, tile->ref_mbs = 0; if (p || b) { - if (tile->num_MBs <= ref_tile->num_MBs) { - tile->ref_mbs = ref_tile->mbs; - }else - av_log(NULL, AV_LOG_DEBUG, "Cannot use ref_tile, too few mbs\n"); - + if (tile->num_MBs != ref_tile->num_MBs) { + av_log(NULL, AV_LOG_DEBUG, "ref_tile mismatch\n"); + return AVERROR_INVALIDDATA; + } + tile->ref_mbs = ref_tile->mbs; ref_tile++; } tile++; |