Silenced a few warnings.

Silenced a few VS compiler warnings.

Change-Id: I658ea409c36c05cd11042675e2e42ccde0ef2420

5 files changed, 6 insertions, 8 deletions

diff --git a/vp9/common/reconintra.c b/vp9/common/reconintra.c
index c9b8bd052..60de8eb43 100644
--- a/vp9/common/reconintra.c
+++ b/vp9/common/reconintra.c
@@ -199,7 +199,7 @@ static void d153_predictor(uint8_t *ypred_ptr, int y_stride, int n,
 static void corner_predictor(unsigned char *ypred_ptr, int y_stride, int n,
                              unsigned char *yabove_row,
                              unsigned char *yleft_col) {
-  int h[32], v[32], mh, mv, maxgradh, maxgradv, x, y, nx, ny;
+  int mh, mv, maxgradh, maxgradv, x, y, nx, ny;
   int i, j;
   int top_left = yabove_row[-1];
   mh = mv = 0;
diff --git a/vp9/decoder/decodemv.c b/vp9/decoder/decodemv.c
index e9f37958c..4b853f7f5 100644
--- a/vp9/decoder/decodemv.c
+++ b/vp9/decoder/decodemv.c
@@ -19,6 +19,7 @@
 #include "vp9/common/pred_common.h"
 #include "vp9/common/entropy.h"
 #include "vp9/decoder/decodemv.h"
+#include "vp9/common/mvref_common.h"
 #if CONFIG_DEBUG
 #include <assert.h>
 #endif
@@ -721,7 +722,6 @@ static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
 
   // If reference frame is an Inter frame
   if (mbmi->ref_frame) {
-    int rct[4];
     int_mv nearest, nearby, best_mv;
     int_mv nearest_second, nearby_second, best_mv_second;
     vp9_prob mv_ref_p [VP9_MVREFS - 1];
diff --git a/vp9/decoder/detokenize.c b/vp9/decoder/detokenize.c
index 54baa0c95..a24d6f2f9 100644
--- a/vp9/decoder/detokenize.c
+++ b/vp9/decoder/detokenize.c
@@ -615,7 +615,8 @@ int vp9_decode_coefs_4x4(VP9D_COMP *dx, MACROBLOCKD *xd,
   return c;
 }
 
-int vp9_decode_mb_tokens(VP9D_COMP *dx, MACROBLOCKD *xd,
+int vp9_decode_mb_tokens(VP9D_COMP* const dx,
+                         MACROBLOCKD* const xd,
                          BOOL_DECODER* const bc) {
   int i, type, eobtotal = 0;
 
diff --git a/vp9/encoder/bitstream.c b/vp9/encoder/bitstream.c
index d88cfd055..e276eed81 100644
--- a/vp9/encoder/bitstream.c
+++ b/vp9/encoder/bitstream.c
@@ -912,13 +912,10 @@ static void pack_inter_mode_mvs(VP9_COMP *const cpi, vp9_writer *const bc) {
           }
         } else {
           int_mv best_mv, best_second_mv;
-          int ct[4];
 
           vp9_prob mv_ref_p [VP9_MVREFS - 1];
 
           {
-            int_mv n1, n2;
-
             best_mv.as_int = mi->ref_mvs[rf][0].as_int;
 
             vp9_mv_ref_probs(&cpi->common, mv_ref_p, mi->mb_mode_context[rf]);
@@ -972,7 +969,6 @@ static void pack_inter_mode_mvs(VP9_COMP *const cpi, vp9_writer *const bc) {
 
           if (mi->second_ref_frame &&
               (mode == NEWMV || mode == SPLITMV)) {
-            int_mv n1, n2;
 
             best_second_mv.as_int =
               mi->ref_mvs[mi->second_ref_frame][0].as_int;
diff --git a/vp9/encoder/encodeframe.c b/vp9/encoder/encodeframe.c
index 98e03d6f7..85d7dd584 100644
--- a/vp9/encoder/encodeframe.c
+++ b/vp9/encoder/encodeframe.c
@@ -1552,9 +1552,10 @@ static int check_dual_ref_flags(VP9_COMP *cpi) {
 
 static void reset_skip_txfm_size(VP9_COMP *cpi, TX_SIZE txfm_max) {
   VP9_COMMON *cm = &cpi->common;
-  int mb_row, mb_col, mis = cm->mode_info_stride, segment_id, skip;
+  int mb_row, mb_col, mis = cm->mode_info_stride, segment_id;
   MODE_INFO *mi, *mi_ptr = cm->mi;
 #if CONFIG_SUPERBLOCKS
+  int skip;
   MODE_INFO *sb_mi_ptr = cm->mi, *sb_mi;
   MB_MODE_INFO *sb_mbmi;
 #endif