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>

diff --cc libavcodec/ivi_common.c
index 14726b3,de9ad55..7577729
--- 1/libavcodec/ivi_common.c
--- 2/libavcodec/ivi_common.c
+++ b/libavcodec/ivi_common.c
@@@ -342,11 -343,9 +342,11 @@@ static int ivi_init_tiles(IVIBandDesc *
  
              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)
++                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++;