Merge remote branch 'origin/master' into experimental

Change-Id: I7395011ef6c1783110ebd06305ca3d908d2457bb

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

diff --cc vp8/encoder/rdopt.c
index 268938f,81545fb..53b2ed7
--- 1/vp8/encoder/rdopt.c
--- 2/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -240,15 -198,11 +240,15 @@@ static int sad_per_bit4lut[QINDEX_RANGE
  
  void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex)
  {
-     cpi->mb.sadperbit16 =  sad_per_bit16lut[QIndex];
-     cpi->mb.sadperbit4  =  sad_per_bit4lut[QIndex];
+     cpi->mb.sadperbit16 =  sad_per_bit16lut[QIndex]/2;
+     cpi->mb.sadperbit4  =  sad_per_bit4lut[QIndex]/2;
  }
  
 -void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue)
 +
 +
 +
 +
 +void vp8_initialize_rd_consts(VP8_COMP *cpi, int QIndex)
  {
      int q;
      int i;