ref: ae74199ecf46086ec245506a570052e7310bdb24
parent: deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc
parent: e18d7bc23095b89132007c64e38ce262dcb0a943
author: John Koleszar <jkoleszar@google.com>
date: Mon Jun 20 05:07:43 EDT 2011
Merge remote branch 'internal/upstream-experimental' into HEAD Conflicts: vp8/encoder/encodeframe.c vp8/encoder/rdopt.c Change-Id: I6ff3d92aa400bef10f6cc87f9da7ebaf6db8cc88
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -782,9 +782,6 @@
vp8cx_frame_init_quantizer(cpi);
- vp8_initialize_rd_consts(cpi,
- vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q));
-
vp8cx_initialize_me_consts(cpi, cm->base_qindex);
if(cpi->oxcf.tuning == VP8_TUNE_SSIM)
--
⑨