From 358b0efec5c52ff4091ede5f7c63535a90940c2d Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Tue, 4 Dec 2012 15:43:25 -0800 Subject: [PATCH] Remove cpi parameter from update_mvcount() cpi is no longer used . Change-Id: Ie86b994059e506cc1944212e12d4f75c041c1d15 --- vp8/encoder/pickinter.c | 4 ++-- vp8/encoder/rdopt.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index e4574f298..efa7d657e 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -389,7 +389,7 @@ static void pick_intra_mbuv_mode(MACROBLOCK *mb) } -static void update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) +static void update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv) { MACROBLOCKD *xd = &x->e_mbd; /* Split MV modes currently not supported when RD is nopt enabled, @@ -1241,7 +1241,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int; - update_mvcount(cpi, x, &best_ref_mv); + update_mvcount(x, &best_ref_mv); } diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 15055f046..d80794ff0 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -1728,7 +1728,7 @@ void vp8_cal_sad(VP8_COMP *cpi, MACROBLOCKD *xd, MACROBLOCK *x, int recon_yoffse } } -static void rd_update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) +static void rd_update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv) { if (x->e_mbd.mode_info_context->mbmi.mode == SPLITMV) { @@ -2603,7 +2603,7 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int; - rd_update_mvcount(cpi, x, &best_ref_mv); + rd_update_mvcount(x, &best_ref_mv); } void vp8_rd_pick_intra_mode(MACROBLOCK *x, int *rate_)