Merge "more unused variables." into experimental

vp9/encoder/vp9_encodeframe.c

@@ -534,11 +534,12 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x,
     // Note how often each mode chosen as best
     cpi->mode_chosen_counts[mb_mode_index]++;
     if (mbmi->mode == SPLITMV || mbmi->mode == NEWMV) {
-      static int testcount = 0;
       int_mv best_mv, best_second_mv;
-      unsigned int best_index;
       MV_REFERENCE_FRAME rf = mbmi->ref_frame;
+#if CONFIG_NEW_MVREF
+      unsigned int best_index;
       MV_REFERENCE_FRAME sec_ref_frame = mbmi->second_ref_frame;
+#endif
       best_mv.as_int = ctx->best_ref_mv.as_int;
       best_second_mv.as_int = ctx->second_best_ref_mv.as_int;
       if (mbmi->mode == NEWMV) {

vp9/encoder/vp9_encodemb.c

@@ -610,7 +610,6 @@ void vp9_optimize_mby_4x4(MACROBLOCK *x) {
   ENTROPY_CONTEXT_PLANES t_above, t_left;
   ENTROPY_CONTEXT *ta;
   ENTROPY_CONTEXT *tl;
-  MB_PREDICTION_MODE mode = x->e_mbd.mode_info_context->mbmi.mode;
 
   if (!x->e_mbd.above_context || !x->e_mbd.left_context)
     return;

vp9/encoder/vp9_encodemv.c

@@ -414,7 +414,9 @@ void vp9_write_nmv_probs(VP9_COMP* const cpi, int usehp, vp9_writer* const bc) {
   unsigned int branch_ct_fp[2][4 - 1][2];
   unsigned int branch_ct_class0_hp[2][2];
   unsigned int branch_ct_hp[2][2];
+#ifdef MV_GROUP_UPDATE
   int savings = 0;
+#endif
 
 #ifdef NMV_STATS
   if (!cpi->dummy_packing)

vp9/encoder/vp9_firstpass.c

@@ -482,7 +482,6 @@ void vp9_first_pass(VP9_COMP *cpi) {
   // if( cm->current_video_frame == 0)
   // if ( 0 )
   {
-    int flag[2] = {1, 1};
     vp9_init_mv_probs(cm);
     vp9_initialize_rd_consts(cpi, cm->base_qindex + cm->y1dc_delta_q);
   }