]> granicus.if.org Git - libvpx/commitdiff
Merge "Cleaning up vp9_mvref_common.c."
authorDmitry Kovalev <dkovalev@google.com>
Wed, 2 Apr 2014 18:03:36 +0000 (11:03 -0700)
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>
Wed, 2 Apr 2014 18:03:36 +0000 (11:03 -0700)
1  2 
vp9/common/vp9_mvref_common.c

index 9d3380801d79b19cc70495a004442fe7b428efdc,59a82fc60b84d70cfb74f5fa2cb4c8fc1fb7a14b..61682c42d90e1609ce22b1dc430ec23d53c93280
@@@ -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);
        }
      }
    }