commit bc030eea0c1c5bbbb19748383fd307dbdc32d55d
author Zoe Liu <zoeliu@google.com> Mon Jul 31 15:20:46 2017 -0700
committer Zoe Liu <zoeliu@google.com> Mon Jul 31 23:36:40 2017 +0000
tree 4af4eacac108bcbfb2cdf2ffb217186b0cadc074
parent 9ee82650c966b2379ea1d8df1a1dc5c48a3a8fff

Fix build warnings when global_motion is off

Change-Id: I69f042e6da5a4b5e4a18853c5f15532dfef0204a

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 2260877..9e1cf76 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -440,7 +440,6 @@
   AV1_COMMON *const cm = &cpi->common;
   MACROBLOCK *const x = &cpi->td.mb;
   RD_OPT *const rd = &cpi->rd;
-  int i;
   int nmv_ctx;
 
   aom_clear_system_state();
@@ -474,7 +473,7 @@
   if (cpi->oxcf.pass != 1) {
     av1_fill_token_costs(x->token_costs, cm->fc->coef_probs);
 #if CONFIG_GLOBAL_MOTION
-    for (i = 0; i < TRANS_TYPES; ++i)
+    for (int i = 0; i < TRANS_TYPES; ++i)
       cpi->gmtype_cost[i] = (1 + (i > 0 ? GLOBAL_TYPE_BITS : 0))
                             << AV1_PROB_COST_SHIFT;
 #endif  // CONFIG_GLOBAL_MOTION