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

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

90e84704ae940d7380bba36310c94a05bc9f4569
diff --cc vp8/encoder/rdopt.c
index 268938fed,81545fb65..53b2ed745
--- a/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;