From: Dmitry Kovalev <dkovalev@google.com>
Date: Wed, 2 Apr 2014 18:03:36 +0000 (-0700)
Subject: Merge "Cleaning up vp9_mvref_common.c."
X-Git-Tag: v1.4.0~1922
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b8606a7374026d561a2c9596df772b5854e3654;p=libvpx

Merge "Cleaning up vp9_mvref_common.c."
---

8b8606a7374026d561a2c9596df772b5854e3654
diff --cc vp9/common/vp9_mvref_common.c
index 9d3380801,59a82fc60..61682c42d
--- a/vp9/common/vp9_mvref_common.c
+++ b/vp9/common/vp9_mvref_common.c
@@@ -259,12 -262,12 +261,11 @@@ static void find_mv_refs_idx(const VP9_
      for (i = 0; i < MVREF_NEIGHBOURS; ++i) {
        const POSITION *mv_ref = &mv_ref_search[i];
        if (is_inside(tile, mi_col, mi_row, cm->mi_rows, mv_ref)) {
 -        const MB_MODE_INFO *const candidate = &xd->mi_8x8[mv_ref->col +
 -                                                          mv_ref->row
 -                                              * xd->mode_info_stride]->mbmi;
 +        const MB_MODE_INFO *const candidate = &xd->mi[mv_ref->col + mv_ref->row
 +                                              * xd->mi_stride]->mbmi;
  
          // If the candidate is INTRA we don't want to consider its mv.
-         if (is_inter_block(candidate))
-           IF_DIFF_REF_FRAME_ADD_MV(candidate);
+         IF_DIFF_REF_FRAME_ADD_MV(candidate);
        }
      }
    }