From: John Koleszar <jkoleszar@google.com>
Date: Mon, 6 Jun 2011 19:50:48 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream-experimental' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~266
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=be15a099806347111cf461371f4fef0e783fd548;p=libvpx

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

Conflicts:
	vp8/encoder/encodeframe.c

Change-Id: Ibb5a3894ede08ed401ec6e974a8902d7393c9978
---

be15a099806347111cf461371f4fef0e783fd548
diff --cc vp8/encoder/encodeframe.c
index 1722a3056,540b2c630..abdbbac0b
--- a/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 ((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;
 +
-         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;
-         }
+         /* 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;