ref: b3055ec020078d228924b1c57a1f353728fb419a
parent: 8422ef772d6263053844858818a3dfd48137a327
parent: cf671e2756d1b27ff1ac222a2fb5f3800f63a5d5
author: Yaowu Xu <yaowu@google.com>
date: Thu Nov 29 04:33:59 EST 2012
Merge "more unused variables." into experimental
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -534,11 +534,12 @@
// Note how often each mode chosen as best
cpi->mode_chosen_counts[mb_mode_index]++;
if (mbmi->mode == SPLITMV || mbmi->mode == NEWMV) {
- static int testcount = 0;
int_mv best_mv, best_second_mv;
- unsigned int best_index;
MV_REFERENCE_FRAME rf = mbmi->ref_frame;
+#if CONFIG_NEW_MVREF
+ unsigned int best_index;
MV_REFERENCE_FRAME sec_ref_frame = mbmi->second_ref_frame;
+#endif
best_mv.as_int = ctx->best_ref_mv.as_int;
best_second_mv.as_int = ctx->second_best_ref_mv.as_int;
if (mbmi->mode == NEWMV) {
--- a/vp9/encoder/vp9_encodemb.c
+++ b/vp9/encoder/vp9_encodemb.c
@@ -610,7 +610,6 @@
ENTROPY_CONTEXT_PLANES t_above, t_left;
ENTROPY_CONTEXT *ta;
ENTROPY_CONTEXT *tl;
- MB_PREDICTION_MODE mode = x->e_mbd.mode_info_context->mbmi.mode;
if (!x->e_mbd.above_context || !x->e_mbd.left_context)
return;
--- a/vp9/encoder/vp9_encodemv.c
+++ b/vp9/encoder/vp9_encodemv.c
@@ -414,7 +414,9 @@
unsigned int branch_ct_fp[2][4 - 1][2];
unsigned int branch_ct_class0_hp[2][2];
unsigned int branch_ct_hp[2][2];
+#ifdef MV_GROUP_UPDATE
int savings = 0;
+#endif
#ifdef NMV_STATS
if (!cpi->dummy_packing)
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -482,7 +482,6 @@
// if( cm->current_video_frame == 0)
// if ( 0 )
{
- int flag[2] = {1, 1};
vp9_init_mv_probs(cm);
vp9_initialize_rd_consts(cpi, cm->base_qindex + cm->y1dc_delta_q);
}