diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-06-20 09:07:43 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-06-20 09:07:43 -0400 |
| commit | ae74199ecf46086ec245506a570052e7310bdb24 (patch) | |
| tree | afef884c26dac34a001211652dca77e5efa4c170 /vp8/encoder/encodeframe.c | |
| parent | deb2e9cf620087b4dc5b78423b6ff9bf8971c1bc (diff) | |
| parent | e18d7bc23095b89132007c64e38ce262dcb0a943 (diff) | |
| download | libvpx-ae74199ecf46086ec245506a570052e7310bdb24.tar libvpx-ae74199ecf46086ec245506a570052e7310bdb24.tar.gz libvpx-ae74199ecf46086ec245506a570052e7310bdb24.tar.bz2 libvpx-ae74199ecf46086ec245506a570052e7310bdb24.zip | |
Merge remote branch 'internal/upstream-experimental' into HEAD
Conflicts:
vp8/encoder/encodeframe.c
vp8/encoder/rdopt.c
Change-Id: I6ff3d92aa400bef10f6cc87f9da7ebaf6db8cc88
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index b4fc22c0b..bd0477c64 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -782,9 +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)); - vp8cx_initialize_me_consts(cpi, cm->base_qindex); if(cpi->oxcf.tuning == VP8_TUNE_SSIM) |