Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/encoder/rdopt.c
Use new constant (110) from 10ed60dc7

Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4

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

diff --cc vp8/encoder/rdopt.c
index cd250c42545486575dfe2b10bdddcad929998f0c,e05ffdb1a757b046010506063d78f9300f9dc2ba..9173272fc1092f9a8d8bd5c65aa448e4ba189310
--- 1/vp8/encoder/rdopt.c
--- 2/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -285,21 -238,12 +285,21 @@@ void vp8_initialize_rd_consts(VP8_COMP 
                  (cpi->RDMULT * rd_iifactor[cpi->twopass.next_iiratio]) >> 4;
      }
  
-     cpi->mb.errorperbit = (cpi->RDMULT / 100);
 +#if !CONFIG_EXTEND_QRANGE
 +#else
 +    if (cpi->RDMULT < 7)
 +        cpi->RDMULT = 7;
 +#endif
+     cpi->mb.errorperbit = (cpi->RDMULT / 110);
      cpi->mb.errorperbit += (cpi->mb.errorperbit==0);
  
 +#if CONFIG_EXTEND_QRANGE
 +    if(cpi->mb.errorperbit<1)
 +        cpi->mb.errorperbit=1;
 +#endif
      vp8_set_speed_features(cpi);
  
 -    q = (int)pow(Qvalue, 1.25);
 +    q = (int)pow(vp8_dc_quant(QIndex,0), 1.25);
  
      if (q < 8)
          q = 8;