From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 15 Jul 2013 11:58:38 +0000 (+0200)
Subject: Merge commit 'f9e5261cab067be7278f73d515bc9b601eb56202'
X-Git-Tag: android-x86-4.4-r1~2329
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c4b904caeaa7664870030c3015e1593f90112c9c;p=android-x86%2Fexternal-ffmpeg.git

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>
---

c4b904caeaa7664870030c3015e1593f90112c9c
diff --cc libavcodec/ivi_common.c
index 14726b38b3,de9ad5542c..7577729653
--- a/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++;