From: John Koleszar <jkoleszar@google.com>
Date: Mon, 20 Jun 2011 13:07:43 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream-experimental' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~261
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ae74199ecf46086ec245506a570052e7310bdb24;p=libvpx

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

Conflicts:
	vp8/encoder/encodeframe.c
	vp8/encoder/rdopt.c

Change-Id: I6ff3d92aa400bef10f6cc87f9da7ebaf6db8cc88
---

ae74199ecf46086ec245506a570052e7310bdb24
diff --cc vp8/encoder/encodeframe.c
index b4fc22c0b,5834e6f08..bd0477c64
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -782,9 -729,7 +782,6 @@@ void vp8_encode_frame(VP8_COMP *cpi
  
      vp8cx_frame_init_quantizer(cpi);
  
-     vp8_initialize_rd_consts(cpi,
-                              vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q));
- 
 -    vp8_initialize_rd_consts(cpi, cm->base_qindex + cm->y1dc_delta_q);
      vp8cx_initialize_me_consts(cpi, cm->base_qindex);
  
      if(cpi->oxcf.tuning == VP8_TUNE_SSIM)