Merge "New mode_info_context storage -- undo revert"

diff --cc vp9/encoder/vp9_encodeframe.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge

diff --cc vp9/encoder/vp9_quantize.c
Simple merge

diff --cc vp9/encoder/vp9_rdopt.c
index cbc8d462636962a3dc9884a6a66128ffa4a9986b,8f4e4e08d2bf889155406e7680b16bf262b7c01d..feb3ba4cfcfd1e7e7bf9dab4ff8d8b6f3c28b00b
--- 1/vp9/encoder/vp9_rdopt.c
--- 2/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@@ -3058,12 -3054,12 +3058,12 @@@ int64_t vp9_rd_pick_inter_mode_sb(VP9_C
                                    int64_t best_rd_so_far) {
    VP9_COMMON *cm = &cpi->common;
    MACROBLOCKD *xd = &x->e_mbd;
-   MB_MODE_INFO *mbmi = &xd->mode_info_context->mbmi;
+   MB_MODE_INFO *mbmi = &xd->this_mi->mbmi;
    const struct segmentation *seg = &cm->seg;
    const BLOCK_SIZE block_size = get_plane_block_size(bsize, &xd->plane[0]);
 -  MB_PREDICTION_MODE this_mode;
 +  RD_PREDICTION_MODE this_mode;
    MV_REFERENCE_FRAME ref_frame, second_ref_frame;
-   unsigned char segment_id = xd->mode_info_context->mbmi.segment_id;
+   unsigned char segment_id = mbmi->segment_id;
    int comp_pred, i;
    int_mv frame_mv[MB_MODE_COUNT][MAX_REF_FRAMES];
    struct buf_2d yv12_mb[4][MAX_MB_PLANE];
@@@ -3784,9 -3777,9 +3784,9 @@@
          best_skip2 = this_skip2;
          best_partition = *x->partition_info;
  
 -        if (this_mode == I4X4_PRED || this_mode == SPLITMV)
 +        if (this_mode == RD_I4X4_PRED || this_mode == RD_SPLITMV)
            for (i = 0; i < 4; i++)
-             best_bmodes[i] = xd->mode_info_context->bmi[i];
+             best_bmodes[i] = xd->this_mi->bmi[i];
  
          // TODO(debargha): enhance this test with a better distortion prediction
          // based on qp, activity mask and history