ref: bbd5cb2bd4c348a3a033c211346e13ee1f1f6496
parent: 495ff8e0c7c862c3227551f4d87a1f2455a79a45
parent: 4524548f80efd35ffd9f65ad3b86717bba9b98bd
author: Johann <johannkoenig@google.com>
date: Wed Jun 12 09:36:50 EDT 2013
Merge "Fix compile warnings on windows."
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -362,7 +362,7 @@
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.
--- a/vp9/common/vp9_findnearmv.h
+++ b/vp9/common/vp9_findnearmv.h
@@ -72,7 +72,7 @@
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,
--
⑨