summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-08-26 00:05:06 -0400
committerJohn Koleszar <jkoleszar@google.com>2011-08-26 00:05:06 -0400
commit4a28115464c3e2ae4b02b3f63fa7047db02552f9 (patch)
treea523c941a6390331ce715c4564a6f8a2fa47bb12
parentbf9f23be457392c1e7d67fcfc1baae077febab68 (diff)
parent4797a972158db967f255e173ba0b37d47420f803 (diff)
downloadlibvpx-4a28115464c3e2ae4b02b3f63fa7047db02552f9.tar
libvpx-4a28115464c3e2ae4b02b3f63fa7047db02552f9.tar.gz
libvpx-4a28115464c3e2ae4b02b3f63fa7047db02552f9.tar.bz2
libvpx-4a28115464c3e2ae4b02b3f63fa7047db02552f9.zip
Merge remote branch 'internal/upstream' into HEAD
-rw-r--r--vp8/encoder/firstpass.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/vp8/encoder/firstpass.c b/vp8/encoder/firstpass.c
index 6923edef3..f2a1cd2d6 100644
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -1473,7 +1473,6 @@ static int calc_arf_boost(
int i;
double boost_score = 0.0;
- double fwd_boost_score = 0.0;
double mv_ratio_accumulator = 0.0;
double decay_accumulator = 1.0;
double this_frame_mv_in_out = 0.0;