Fix bad merge

Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 6a1c4b7064ca9005cb45e6d8ec4d294d5b26ae2c..b457f03cb1097d8813db8f621c5216137bb3f6a3 100644 (file)
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -1965,11 +1965,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
     int intra_rd_penalty =  10* vp8_dc_quant(cpi->common.base_qindex,
                                              cpi->common.y1dc_delta_q);
 
-#if CONFIG_TEMPORAL_DENOISING
-    unsigned int zero_mv_sse = INT_MAX, best_sse = INT_MAX,
-            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;