diff options
| author | Jim Bankoski <jimbankoski@google.com> | 2012-11-29 08:54:59 -0800 |
|---|---|---|
| committer | Jim Bankoski <jimbankoski@google.com> | 2012-11-29 08:54:59 -0800 |
| commit | cf671e2756d1b27ff1ac222a2fb5f3800f63a5d5 (patch) | |
| tree | d9764deab5285d28e22c16da3f2aafa20c34bb7b | |
| parent | 6e02947e29f64274bfcf48e73d9c3eb74ac8347b (diff) | |
| download | libvpx-cf671e2756d1b27ff1ac222a2fb5f3800f63a5d5.tar libvpx-cf671e2756d1b27ff1ac222a2fb5f3800f63a5d5.tar.gz libvpx-cf671e2756d1b27ff1ac222a2fb5f3800f63a5d5.tar.bz2 libvpx-cf671e2756d1b27ff1ac222a2fb5f3800f63a5d5.zip | |
more unused variables.
Change-Id: Ibe11e9275949b26a77fa9c8ac2e7c356ae533d5d
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemb.c | 1 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodemv.c | 2 | ||||
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1d06d9d57..ab32fa12c 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -534,11 +534,12 @@ static void update_state(VP9_COMP *cpi, MACROBLOCK *x, // 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) { diff --git a/vp9/encoder/vp9_encodemb.c b/vp9/encoder/vp9_encodemb.c index 68aa41447..0740292bc 100644 --- a/vp9/encoder/vp9_encodemb.c +++ b/vp9/encoder/vp9_encodemb.c @@ -610,7 +610,6 @@ void vp9_optimize_mby_4x4(MACROBLOCK *x) { 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; diff --git a/vp9/encoder/vp9_encodemv.c b/vp9/encoder/vp9_encodemv.c index b2589c107..9431f0781 100644 --- a/vp9/encoder/vp9_encodemv.c +++ b/vp9/encoder/vp9_encodemv.c @@ -414,7 +414,9 @@ void vp9_write_nmv_probs(VP9_COMP* const cpi, int usehp, vp9_writer* const bc) { 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) diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index 8a05eb8fd..6179f2cf9 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -482,7 +482,6 @@ void vp9_first_pass(VP9_COMP *cpi) { // 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); } |