diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-04-26 08:28:51 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-04-26 08:28:51 -0400 |
| commit | 0a77e59847967f76f022e3d8eacef302f4a16038 (patch) | |
| tree | 226aad9ddfa0d2d7bba975a6b009ae83b06b9f60 /vp8/encoder/rdopt.c | |
| parent | 5227798c570af08d08dd6fdd7a3e96d5dc96977b (diff) | |
| parent | d5c46bdfc0d7bcc25e3ff549a0dc03d759050c19 (diff) | |
| download | libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.tar libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.tar.gz libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.tar.bz2 libvpx-0a77e59847967f76f022e3d8eacef302f4a16038.zip | |
Merge remote branch 'origin/master' into experimental
Conflicts:
vp8/common/alloccommon.c
vp8/encoder/rdopt.c
Change-Id: I142167d31d1b9cffe143774f6915bca463df67f0
Diffstat (limited to 'vp8/encoder/rdopt.c')
| -rw-r--r-- | vp8/encoder/rdopt.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index 54cfab8c5..dfc9bec95 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -298,9 +298,6 @@ void vp8_initialize_rd_consts(VP8_COMP *cpi, int QIndex) #endif vp8_set_speed_features(cpi); - if (cpi->common.simpler_lpf) - cpi->common.filter_type = SIMPLE_LOOPFILTER; - q = (int)pow(vp8_dc_quant(QIndex,0), 1.25); if (q < 8) @@ -2526,7 +2523,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int best_mbmode.uv_mode = 0; best_mbmode.mb_skip_coeff = (cpi->common.mb_no_coeff_skip) ? 1 : 0; best_mbmode.partitioning = 0; - best_mbmode.dc_diff = 0; vpx_memcpy(&x->e_mbd.mode_info_context->mbmi, &best_mbmode, sizeof(MB_MODE_INFO)); vpx_memcpy(x->partition_info, &best_partition, sizeof(PARTITION_INFO)); |