commit a631722c36f9819c06a7d4a4f57424fa418753dd
author Yaowu Xu <yaowu@google.com> Mon Apr 17 11:29:51 2017 -0700
committer Yaowu Xu <yaowu@google.com> Mon Apr 17 19:20:11 2017 +0000
tree fa15e02b11584dd1ad6939d029dcbf9266440e8d
parent f0dfc03d887a828f873e4f4501253aeb700fb931

Fix build for motion-var and ext-inter

Change-Id: If7a3dc0006543c30f55f4ed2b33f28b69395bd60

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index cbd4c73..b15b99d 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8194,10 +8194,6 @@
   (void)is_comp_pred;
   (void)this_mode;
 
-#if CONFIG_EXT_INTER && CONFIG_MOTION_VAR
-  int mv_idx = 0;
-#endif  // CONFIG_EXT_INTER && CONFIG_MOTION_VAR
-
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
   MOTION_MODE motion_mode, last_motion_mode_allowed;
   int rate2_nocoeff = 0, best_xskip, best_disable_skip = 0;
@@ -8261,7 +8257,7 @@
 
         single_motion_search(cpi, x, bsize, mi_row, mi_col,
 #if CONFIG_EXT_INTER
-                             0, mv_idx,
+                             0,
 #endif  // CONFIG_EXT_INTER
                              &tmp_rate_mv);
         mbmi->mv[0].as_int = x->best_mv.as_int;