Fix warnings.
Change-Id: I6dd27a0ea661e6f10a55d7841021b66ae4fc72ae
This commit is contained in:
Родитель
e44ee38aef
Коммит
c5b70370dc
|
@ -54,7 +54,7 @@ void vp8_init_mode_costs(VP8_COMP *c)
|
||||||
x->fc.uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
|
x->fc.uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
|
||||||
vp8_cost_tokens(c->mb.intra_uv_mode_cost[0],
|
vp8_cost_tokens(c->mb.intra_uv_mode_cost[0],
|
||||||
x->kf_uv_mode_prob[VP8_YMODES-1], vp8_uv_mode_tree);
|
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);
|
x->fc.i8x8_mode_prob,vp8_i8x8_mode_tree);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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_comp_rd = INT_MAX;
|
||||||
int best_single_rd = INT_MAX;
|
int best_single_rd = INT_MAX;
|
||||||
int best_hybrid_rd = INT_MAX;
|
int best_hybrid_rd = INT_MAX;
|
||||||
|
#if CONFIG_PRED_FILTER
|
||||||
int best_overall_rd = INT_MAX;
|
int best_overall_rd = INT_MAX;
|
||||||
|
#endif
|
||||||
int rate2, distortion2;
|
int rate2, distortion2;
|
||||||
int uv_intra_rate, uv_intra_distortion, uv_intra_rate_tokenonly;
|
int uv_intra_rate, uv_intra_distortion, uv_intra_rate_tokenonly;
|
||||||
int uv_intra_skippable = 0;
|
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 rate_y, UNINITIALIZED_IS_SAFE(rate_uv);
|
||||||
int distortion_uv;
|
int distortion_uv;
|
||||||
int best_yrd = INT_MAX;
|
int best_yrd = INT_MAX;
|
||||||
|
#if CONFIG_PRED_FILTER
|
||||||
int best_filter_state;
|
int best_filter_state;
|
||||||
|
#endif
|
||||||
//int all_rds[MAX_MODES]; // Experimental debug code.
|
//int all_rds[MAX_MODES]; // Experimental debug code.
|
||||||
//int all_rates[MAX_MODES];
|
//int all_rates[MAX_MODES];
|
||||||
//int all_dist[MAX_MODES];
|
//int all_dist[MAX_MODES];
|
||||||
|
|
Загрузка…
Ссылка в новой задаче