From: John Koleszar <jkoleszar@google.com>
Date: Mon, 11 Jun 2012 19:24:14 +0000 (-0700)
Subject: Fix bad merge
X-Git-Tag: v1.2.0~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7;p=libvpx

Fix bad merge

Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556
---

diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 6a1c4b706..b457f03cb 100644
--- 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;