summaryrefslogtreecommitdiff
path: root/vp8/encoder/rdopt.c
diff options
context:
space:
mode:
authorJohn Koleszar <jkoleszar@google.com>2011-05-20 11:20:44 -0700
committerCode Review <code-review@webmproject.org>2011-05-20 11:20:44 -0700
commit8196cc85f819f49d10c01ddba63975fd5a282aae (patch)
tree9cc712e583e0816838937cfaaa475dfeaa3df1f1 /vp8/encoder/rdopt.c
parent6d82d2d22e300f886d27c36106a56daa6a81b763 (diff)
parent63cb1a7ce0cb7b41ec3f5c3ad05202eed00ff22a (diff)
downloadlibvpx-8196cc85f819f49d10c01ddba63975fd5a282aae.tar
libvpx-8196cc85f819f49d10c01ddba63975fd5a282aae.tar.gz
libvpx-8196cc85f819f49d10c01ddba63975fd5a282aae.tar.bz2
libvpx-8196cc85f819f49d10c01ddba63975fd5a282aae.zip
Merge "cleanup: collect twopass variables"
Diffstat (limited to 'vp8/encoder/rdopt.c')
-rw-r--r--vp8/encoder/rdopt.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 5ac3e4fa7..0c430a7b2 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -232,10 +232,11 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue)
if (cpi->pass == 2 && (cpi->common.frame_type != KEY_FRAME))
{
- if (cpi->next_iiratio > 31)
+ if (cpi->twopass.next_iiratio > 31)
cpi->RDMULT += (cpi->RDMULT * rd_iifactor[31]) >> 4;
else
- cpi->RDMULT += (cpi->RDMULT * rd_iifactor[cpi->next_iiratio]) >> 4;
+ cpi->RDMULT +=
+ (cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
}
cpi->mb.errorperbit = (cpi->RDMULT / 100);