aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2013-07-14 16:49:43 +0200
committerLuca Barbato <lu_zero@gentoo.org>2013-07-15 11:46:30 +0200
commitf9e5261cab067be7278f73d515bc9b601eb56202 (patch)
treebf4434b52705c7ecf25f8e6ecf790938d9950b2e /libavcodec
parent28dda8a691f1c723a4a9365ab85f9625f1330096 (diff)
downloadffmpeg-f9e5261cab067be7278f73d515bc9b601eb56202.tar.gz
indeo: Do not reference mismatched tiles
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/ivi_common.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c
index 6436cd3874..de9ad5542c 100644
--- a/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@ -343,6 +343,8 @@ 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)
+ return AVERROR_INVALIDDATA;
tile->ref_mbs = ref_tile->mbs;
ref_tile++;
}