Merge remote branch 'internal/upstream' into HEAD

diff --cc configure
Simple merge

diff --cc vp8/common/alloccommon.c
Simple merge

diff --cc vp8/common/generic/systemdependent.c
Simple merge

diff --cc vp8/common/onyxc_int.h
Simple merge

diff --cc vp8/decoder/decodemv.c
index 39a39e16082b0e776136311707f98bb10a8f50a5,cd67536bc6cd99b4e49b9fcb21092dbfc19707af..a97193f0fec7f0d1be956d5c99e255b363d96b8f
--- 1/vp8/decoder/decodemv.c
--- 2/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);

diff --cc vp8/decoder/decodframe.c
Simple merge

diff --cc vp8/decoder/onyxd_if.c
Simple merge

diff --cc vp8/decoder/onyxd_int.h
Simple merge

diff --cc vp8/encoder/encodeframe.c
Simple merge

diff --cc vp8/encoder/generic/csystemdependent.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/onyx_int.h
Simple merge

diff --cc vp8/encoder/rdopt.c
Simple merge