diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-06-11 12:24:14 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-06-11 12:24:14 -0700 |
| commit | 52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7 (patch) | |
| tree | 3ab5874e0ca79170f2673da961241d5b60d73034 /vp8/encoder | |
| parent | 598759be1daeef71bb5644bbf617b798630f5db3 (diff) | |
| download | libvpx-52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7.tar libvpx-52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7.tar.gz libvpx-52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7.tar.bz2 libvpx-52ec78be7d6c8f103e63a76e3e14ded48ccd5cd7.zip | |
Fix bad merge
Change-Id: I45849dde0ee9b7e87fa32adb65ade8486bb66556
Diffstat (limited to 'vp8/encoder')
| -rw-r--r-- | vp8/encoder/rdopt.c | 5 |
1 files changed, 0 insertions, 5 deletions
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 @@ -1970,11 +1970,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, 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; |