Merge "Preliminary code for variance based paritioning"

vp9/encoder/vp9_mcomp.c

@@ -866,7 +866,7 @@ int vp9_square_search(const MACROBLOCK *x,
                             do_init_search, 0, vfp, use_mvcost,
                             center_mv, best_mv,
                             square_num_candidates, square_candidates);
-};
+}
 
 int vp9_fast_hex_search(const MACROBLOCK *x,
                         MV *ref_mv,

vp9/encoder/vp9_onyx_if.c

@@ -875,7 +875,7 @@ static void set_rt_speed_feature(VP9_COMMON *cm,
   if (speed >= 8) {
     int i;
     for (i = 0; i < BLOCK_SIZES; ++i)
-      sf->disable_inter_mode_mask[i] = 14;   // only search NEARESTMV (0)
+      sf->disable_inter_mode_mask[i] = 14;    // only search NEARESTMV (0)
   }
 }
 

vp9/encoder/vp9_pickmode.c

@@ -250,7 +250,6 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
   x->skip = 0;
   if (!x->in_active_map)
     x->skip = 1;
-
   // initialize mode decisions
   *returnrate = INT_MAX;
   *returndistortion = INT64_MAX;