From: John Koleszar <jkoleszar@google.com>
Date: Sat, 21 May 2011 04:05:14 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~282
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e4be958e08a15571d5ab7549e69f022082af5c6b;p=libvpx

Merge remote branch 'internal/upstream' into HEAD
---

e4be958e08a15571d5ab7549e69f022082af5c6b
diff --cc vp8/encoder/rdopt.c
index 48070ab49,0c430a7b2..6c1ff3687
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -278,17 -232,13 +278,18 @@@ void vp8_initialize_rd_consts(VP8_COMP 
  
      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;
      }
  
 +#if !CONFIG_EXTEND_QRANGE
 +#else
 +    if (cpi->RDMULT < 7)
 +        cpi->RDMULT = 7;
 +#endif
      cpi->mb.errorperbit = (cpi->RDMULT / 100);
      cpi->mb.errorperbit += (cpi->mb.errorperbit==0);