ref: 52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7
parent: 598759be1daeef71bb5644bbf617b798630f5db3
author: John Koleszar <jkoleszar@google.com>
date: Mon Jun 11 08:24:14 EDT 2012
Fix bad merge Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1970,11 +1970,6 @@
best_rd_sse = INT_MAX;
#endif
-#if CONFIG_TEMPORAL_DENOISING
- unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX,
- best_rd_sse = INT_MAX;
-#endif
-
mode_mv = mode_mv_sb[sign_bias];
best_ref_mv.as_int = 0;
best_mode.rd = INT_MAX;
--
⑨