Merge "Fix compile warnings on windows."

vp8/encoder/onyx_if.c

@@ -362,7 +362,7 @@ static void reset_temporal_layer_change(VP8_COMP *cpi,
                                         VP8_CONFIG *oxcf,
                                         const int prev_num_layers)
 {
-    unsigned int i;
+    int i;
     double prev_layer_frame_rate = 0;
     const int curr_num_layers = cpi->oxcf.number_of_layers;
     // If the previous state was 1 layer, get current layer context from cpi.

vp9/common/vp9_findnearmv.h

@@ -72,7 +72,7 @@ static int check_mv_bounds(int_mv *mv,
 
 vp9_prob *vp9_mv_ref_probs(VP9_COMMON *pc,
                            vp9_prob p[VP9_INTER_MODES - 1],
-                           const int context);
+                           int context);
 
 void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *pc,
                                    MACROBLOCKD *xd,