From: Johann <johannkoenig@google.com>
Date: Wed, 22 Jun 2011 11:45:17 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~430
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=786246ebf1fd4b875f33a8b0c35bab2a3df911b3;p=libvpx

Merge remote branch 'origin/master' into experimental

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

Change-Id: Ic7d8a45ccc8deeeb94a0ab1c58d5d052ef3c27e4
---

786246ebf1fd4b875f33a8b0c35bab2a3df911b3
diff --cc vp8/encoder/rdopt.c
index cd250c425,e05ffdb1a..9173272fc
--- a/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;
      }
  
 +#if !CONFIG_EXTEND_QRANGE
 +#else
 +    if (cpi->RDMULT < 7)
 +        cpi->RDMULT = 7;
 +#endif
-     cpi->mb.errorperbit = (cpi->RDMULT / 100);
+     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;