Fix warnings.

Change-Id: I6dd27a0ea661e6f10a55d7841021b66ae4fc72ae

diff --git a/vp8/encoder/modecosts.c b/vp8/encoder/modecosts.c
index 6cd0da56ad82b6cf0fdff243aeecd60d256d4110..eb8f082f347f09d1253bb6b56b2910258d85e099 100644 (file)
--- a/vp8/encoder/modecosts.c
+++ b/vp8/encoder/modecosts.c
@@ -54,7 +54,7 @@ void vp8_init_mode_costs(VP8_COMP *c)
                     x->fc.uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
     vp8_cost_tokens(c->mb.intra_uv_mode_cost[0],
                     x->kf_uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
-    vp8_cost_tokens(c->mb.i8x8_mode_costs,
+    vp8_cost_tokens((int *)c->mb.i8x8_mode_costs,
                     x->fc.i8x8_mode_prob,vp8_i8x8_mode_tree);
 
 }

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 0ec87bb8fcfec1be69d29fc6667cf7510c60baa7..cc1f7cd200f7a9a4dec7f80688c997c103ccfdd9 100644 (file)
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2811,7 +2811,9 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     int best_comp_rd = INT_MAX;
     int best_single_rd = INT_MAX;
     int best_hybrid_rd = INT_MAX;
+#if CONFIG_PRED_FILTER
     int best_overall_rd = INT_MAX;
+#endif
     int rate2, distortion2;
     int uv_intra_rate, uv_intra_distortion, uv_intra_rate_tokenonly;
     int uv_intra_skippable = 0;
@@ -2820,8 +2822,9 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
     int rate_y, UNINITIALIZED_IS_SAFE(rate_uv);
     int distortion_uv;
     int best_yrd = INT_MAX;
+#if CONFIG_PRED_FILTER
     int best_filter_state;
-
+#endif
     //int all_rds[MAX_MODES];        // Experimental debug code.
     //int all_rates[MAX_MODES];
     //int all_dist[MAX_MODES];