Merge remote branch 'origin/master' into experimental

Change-Id: I90a1d0095712e0474b0c03773b57376911027fc6

diff --cc vp8/encoder/encodeframe.c
Simple merge

diff --cc vp8/encoder/firstpass.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/ratectrl.c
Simple merge

diff --cc vp8/encoder/rdopt.c
index 48070ab49b61947c92c51e5e4d9d2d48952cb1ae,0c430a7b2d98c08752fff8ee98d36a38743d8c83..6c1ff3687d0e3dfba26c186e2ec1d4b23a6acbca
--- 1/vp8/encoder/rdopt.c
--- 2/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);