From 84acc988eb8fb97cb5cd0108739ea55ad8cf7bc7 Mon Sep 17 00:00:00 2001 From: Jingning Han Date: Fri, 13 Dec 2013 12:58:49 -0800 Subject: [PATCH] Remove redefinition in handle_inter_mode Change-Id: I44513b9db6d42e2c52723e1a429f06a93d300c8b --- vp9/encoder/vp9_rdopt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index cdba1e867..5c754c293 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2748,6 +2748,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, intpel_mv &= (mbmi->mv[1].as_mv.row & 15) == 0 && (mbmi->mv[1].as_mv.col & 15) == 0; + // Search for best switchable filter by checking the variance of // pred error irrespective of whether the filter will be used if (cm->mcomp_filter_type != BILINEAR) { @@ -2757,7 +2758,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, *best_filter = EIGHTTAP; vp9_zero(cpi->rd_filter_cache); } else { - int i, newbest; + int newbest; int tmp_rate_sum = 0; int64_t tmp_dist_sum = 0; -- 2.40.0