commit 0bae6244f99f6a70e478942faed0f9fc2466e2ba
author Debargha Mukherjee <debargha@google.com> Tue May 02 21:54:41 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Wed May 03 14:04:36 2017 +0000
tree d5ac92053cbb8599eb9737d98fc6f9760a3f98a1
parent f2e7b9385ce2056570fc107dbdb6472d56b51e91

Fix build failures with global-motion w/o ref-mv

BUG=aomedia:486

Change-Id: I878e8b280e99a107643da76c5f21ac7aa69d37ec

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index ef8e452..5222948 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -869,13 +869,15 @@
                       find_mv_refs_sync sync, void *const data,
                       int16_t *mode_context) {
   int_mv zeromv[2];
+#if CONFIG_GLOBAL_MOTION
+  BLOCK_SIZE bsize = mi->mbmi.sb_type;
+#endif  // CONFIG_GLOBAL_MOTION
 #if CONFIG_REF_MV
   int idx, all_zero = 1;
 #if CONFIG_GLOBAL_MOTION
   MV_REFERENCE_FRAME rf[2];
-  BLOCK_SIZE bsize = mi->mbmi.sb_type;
-#endif
-#endif
+#endif  // CONFIG_GLOBAL_MOTION
+#endif  // CONFIG_REF_MV
 #if CONFIG_EXT_INTER
   av1_update_mv_context(cm, xd, mi, ref_frame, mv_ref_list, -1, mi_row, mi_col,
 #if CONFIG_REF_MV