From: John Koleszar <jkoleszar@google.com>
Date: Fri, 20 May 2011 04:05:16 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~284
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=27331e1377465aad1d97f9796dca56542ba389af;p=libvpx

Merge remote branch 'internal/upstream' into HEAD
---

27331e1377465aad1d97f9796dca56542ba389af
diff --cc vp8/decoder/decodemv.c
index 39a39e160,cd67536bc..a97193f0f
--- a/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@@ -242,10 -243,13 +242,16 @@@ static void mb_mode_mv_init(VP8D_COMP *
  {
      vp8_reader *const bc = & pbi->bc;
      MV_CONTEXT *const mvc = pbi->common.fc.mvc;
 +#if CONFIG_SEGMENTATION
 +    MACROBLOCKD *const xd  = & pbi->mb;
 +#endif
  
+ #if CONFIG_ERROR_CONCEALMENT
+     /* Default is that no macroblock is corrupt, therefore we initialize
+      * mvs_corrupt_from_mb to something very big, which we can be sure is
+      * outside the frame. */
+     pbi->mvs_corrupt_from_mb = UINT_MAX;
+ #endif
      pbi->prob_skip_false = 0;
      if (pbi->common.mb_no_coeff_skip)
          pbi->prob_skip_false = (vp8_prob)vp8_read_literal(bc, 8);