Merge remote branch 'internal/upstream' into HEAD

Conflicts:
	vp8/common/blockd.h
	vp8/decoder/decodemv.c

Change-Id: Ib97c226d5b33b1ac1675d9c96eac1986af4dd579

diff --cc vp8/common/blockd.h
index 88bd59592d71101a06ae3ad416aff826a1e2555c,0eb6ed3742e6feec4f0b9e9549cec04a032c74b3..51c7bfefd9165ddad4a8d6319041e5d976577395
--- 1/vp8/common/blockd.h
--- 2/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@@ -162,12 -157,7 +158,8 @@@ typedef struc
  {
      MB_PREDICTION_MODE mode, uv_mode;
      MV_REFERENCE_FRAME ref_frame;
-     union
-     {
-         int as_int;
-         MV  as_mv;
-     } mv;
+     int_mv mv;
 +    unsigned char segment_flag;
  
      unsigned char partitioning;
      unsigned char mb_skip_coeff;                                /* does this mb has coefficients at all, 1=no coefficients, 0=need decode tokens */

diff --cc vp8/decoder/decodemv.c
index 286659536672b4166ab15d532eddf94ec0aaf5d0,4de28688be0ebdc5bc0c5af76ab542e155e6e95d..39a39e16082b0e776136311707f98bb10a8f50a5
--- 1/vp8/decoder/decodemv.c
--- 2/vp8/decoder/decodemv.c
+++ b/vp8/decoder/decodemv.c
@@@ -291,13 -286,8 +291,12 @@@ static void read_mb_modes_mv(VP8D_COMP 
      vp8_reader *const bc = & pbi->bc;
      MV_CONTEXT *const mvc = pbi->common.fc.mvc;
      const int mis = pbi->common.mode_info_stride;
 -
 +#if CONFIG_SEGMENTATION
 +    MACROBLOCKD *const xd  = & pbi->mb;
 +    int sum;
 +    int index = mb_row * pbi->common.mb_cols + mb_col;
 +#endif
-     MV *const mv = & mbmi->mv.as_mv;
+     int_mv *const mv = & mbmi->mv;
      int mb_to_left_edge;
      int mb_to_right_edge;
      int mb_to_top_edge;

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

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

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

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

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