commit 41a36ded53522466a03458fb6d37d9fcc97ff4ce
author Yaowu Xu <yaowu@google.com> Thu Mar 23 15:55:03 2017 -0700
committer Yaowu Xu <yaowu@google.com> Fri Mar 24 17:27:39 2017 +0000
tree c75aa415080b34eb3166ab780449ce67025c6e27
parent 1f89d0f880479789eb71bcad50848a8e546e31a4

Fix compiling for supertx

Change-Id: I0a067e89d544f72d7ce08b0e4cccb77c4c3c9497

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 3b06151..ad5994c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -10819,19 +10819,20 @@
         *returnrate_nocoef -= av1_cost_bit(av1_get_intra_inter_prob(cm, xd),
                                            mbmi->ref_frame[0] != INTRA_FRAME);
 #if CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
+#if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
+        MODE_INFO *const mi = xd->mi[0];
         const MOTION_MODE motion_allowed = motion_mode_allowed(
 #if CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
             0, xd->global_motion,
 #endif  // CONFIG_GLOBAL_MOTION && SEPARATE_GLOBAL_MOTION
             mi);
-#if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
         if (motion_allowed == WARPED_CAUSAL)
-#endif  // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
           *returnrate_nocoef -= cpi->motion_mode_cost[bsize][mbmi->motion_mode];
-#if CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
         else if (motion_allowed == OBMC_CAUSAL)
           *returnrate_nocoef -=
               cpi->motion_mode_cost1[bsize][mbmi->motion_mode];
+#else
+        *returnrate_nocoef -= cpi->motion_mode_cost[bsize][mbmi->motion_mode];
 #endif  // CONFIG_MOTION_VAR && CONFIG_WARPED_MOTION
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
 #endif  // CONFIG_SUPERTX