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

Conflicts:
	vp8/encoder/encodeframe.c

Change-Id: Ibb5a3894ede08ed401ec6e974a8902d7393c9978

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

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

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

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

diff --cc vp8/encoder/encodeframe.c
index 1722a30568b2ce1f0f66ea931af122c9071689b1,540b2c63097ad2ba99328aee930330a13e3e6a16..abdbbac0bb47c6e56eb25a33dd0c625446978c9e
--- 1/vp8/encoder/encodeframe.c
--- 2/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -488,29 -478,9 +489,14 @@@ void encode_mb_row(VP8_COMP *cpi
          x->mb_activity_ptr++;
          x->mb_norm_activity_ptr++;
  
-         if(cm->frame_type != INTRA_FRAME)
-         {
-             if (xd->mode_info_context->mbmi.mode != B_PRED)
-             {
-                 for (i = 0; i < 16; i++)
-                     xd->mode_info_context->bmi[i].mv.as_int = xd->block[i].bmi.mv.as_int;
-             }else
-             {
-                 for (i = 0; i < 16; i++)
-                     xd->mode_info_context->bmi[i].as_mode = xd->block[i].bmi.mode;
-             }
-         }
-         else
-         {
-             if(xd->mode_info_context->mbmi.mode != B_PRED)
-                 for (i = 0; i < 16; i++)
-                     xd->mode_info_context->bmi[i].as_mode = xd->block[i].bmi.mode;
-         }
 +        if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME))
 +            xd->mode_info_context->mbmi.segment_id = 0;
 +        else
 +            xd->mode_info_context->mbmi.segment_id = 1;
 +
+         /* save the block info */
+         for (i = 0; i < 16; i++)
+             xd->mode_info_context->bmi[i] = xd->block[i].bmi;
  
          // adjust to the next column of macroblocks
          x->src.y_buffer += 16;