Fix bad merge

Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556

Fix bad merge
Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556
52ec78be · John Koleszar · 598759be · 52ec78be
Commit 52ec78be authored Jun 11, 2012 by John Koleszar
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

vp8/encoder/rdopt.c vp8/encoder/rdopt.c +0 -5

No files found.
--- 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;