commit dca192535f79d9e3a31aab0c21ed7d1d88b4aba3
author Jonathan Matthews <jonathan.matthews@argondesign.com> Mon Feb 05 14:34:32 2018 +0000
committer Yunqing Wang <yunqingwang@google.com> Mon Feb 05 18:56:16 2018 +0000
tree 110e100314a3b455d846226a1c30a9f627872c4d
parent 3db3f80f08ff3c615cb8e30202b7ed5426591575

Make recent mv changes build with !INTRABC

Introduced in Change-Id: I219b9ca097b8fa90335d5b00f6edd639886f414d

BUG=aomedia:1316

Change-Id: I0dbf02589a2128aec6db495db653fa4ef0652d53

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 3ccccfe..2122855 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1125,14 +1125,12 @@
   }
 #endif  // !CONFIG_MFMV
 
-  // Since we couldn't find 2 mvs from the same reference frame
-  // go back through the neighbors and find motion vectors from
-  // different reference frames.
-  if (
+// Since we couldn't find 2 mvs from the same reference frame
+// go back through the neighbors and find motion vectors from
+// different reference frames.
 #if CONFIG_INTRABC
-      ref_frame != INTRA_FRAME
+  if (ref_frame != INTRA_FRAME) {
 #endif  // CONFIG_INTRABC
-      ) {
     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, cm, mv_ref)) {
@@ -1150,7 +1148,9 @@
                                  refmv_count, mv_ref_list, bw, bh, xd, Done);
       }
     }
+#if CONFIG_INTRABC
   }
+#endif  // CONFIG_INTRABC
 
 #if !CONFIG_MFMV
   // Since we still don't have a candidate we'll try the last frame.