ref: c5b70370dc928a35229140c95a550aebacbbcf96
parent: e44ee38aef85e48601e54a13939f2a299bb583e0
author: Christian Duvivier <cduvivier@google.com>
date: Fri Jun 29 10:46:11 EDT 2012
Fix warnings. Change-Id: I6dd27a0ea661e6f10a55d7841021b66ae4fc72ae
--- a/vp8/encoder/modecosts.c
+++ b/vp8/encoder/modecosts.c
@@ -54,7 +54,7 @@
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);
}
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2811,7 +2811,9 @@
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 @@
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];
--
⑨