libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_mvref_common.c

Index: source/libvpx/vp9/common/vp9_mvref_common.c
===================================================================
--- source/libvpx/vp9/common/vp9_mvref_common.c	(revision 223100)
+++ source/libvpx/vp9/common/vp9_mvref_common.c	(working copy)
@@ -1,3 +1,4 @@
+
 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
@@ -203,8 +204,8 @@
     const MV *const mv_ref = &mv_ref_search[i];
     if (is_inside(cm, mi_col, mi_row, mv_ref)) {
       const int check_sub_blocks = block_idx >= 0;
-      const MODE_INFO *const candidate_mi = &mi[mv_ref->col + mv_ref->row
-                                                * xd->mode_info_stride];
+      const MODE_INFO *const candidate_mi = xd->mi_8x8[mv_ref->col + mv_ref->row
+                                                   * xd->mode_info_stride];
       const MB_MODE_INFO *const candidate = &candidate_mi->mbmi;
       // Keep counts for entropy encoding.
       context_counter += mode_2_counter[candidate->mode];
@@ -230,8 +231,9 @@
   for (; i < MVREF_NEIGHBOURS; ++i) {
     const MV *const mv_ref = &mv_ref_search[i];
     if (is_inside(cm, mi_col, mi_row, mv_ref)) {
-      const MB_MODE_INFO *const candidate = &mi[mv_ref->col + mv_ref->row
-                                                * xd->mode_info_stride].mbmi;
+      const MB_MODE_INFO *const candidate = &xd->mi_8x8[mv_ref->col +
+                                            mv_ref->row
+                                            * xd->mode_info_stride]->mbmi;
 
       if (candidate->ref_frame[0] == ref_frame) {
         ADD_MV_REF_LIST(candidate->mv[0]);
@@ -259,8 +261,9 @@
     for (i = 0; i < MVREF_NEIGHBOURS; ++i) {
       const MV *mv_ref = &mv_ref_search[i];
       if (is_inside(cm, mi_col, mi_row, mv_ref)) {
-        const MB_MODE_INFO *const candidate = &mi[mv_ref->col + mv_ref->row
-                                                  * xd->mode_info_stride].mbmi;
+        const MB_MODE_INFO *const candidate = &xd->mi_8x8[mv_ref->col +
+                                                          mv_ref->row
+                                              * xd->mode_info_stride]->mbmi;
 
         // If the candidate is INTRA we don't want to consider its mv.
         if (is_inter_block(candidate))