From: John Koleszar <jkoleszar@google.com>
Date: Fri, 3 Jun 2011 04:05:20 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into experimental
X-Git-Tag: v1.3.0~1217^2~434
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=480f0257540324b1ffa7579688924a881638cf8a;p=platform%2Fupstream%2Flibvpx.git

Merge remote branch 'origin/master' into experimental

Change-Id: I7395011ef6c1783110ebd06305ca3d908d2457bb
---

480f0257540324b1ffa7579688924a881638cf8a
diff --cc vp8/encoder/rdopt.c
index 268938f,81545fb..53b2ed7
--- 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;