summaryrefslogtreecommitdiff
path: root/vp9/encoder/vp9_onyx_if.c
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2014-01-07 09:31:17 -0800
committerGerrit Code Review <gerrit@gerrit.golo.chromium.org>2014-01-07 09:31:17 -0800
commit656166ea81ddc8c4af06afadcbd88088dc0a46a7 (patch)
tree83c3ab1da1d975838d9dff64f0bd93fa86615443 /vp9/encoder/vp9_onyx_if.c
parent9e18cf70db560e99ea08c2767b5487af8348c2e1 (diff)
parent393a8ccef9384e84490b1c7f940b5f87408e94b4 (diff)
downloadlibvpx-656166ea81ddc8c4af06afadcbd88088dc0a46a7.tar
libvpx-656166ea81ddc8c4af06afadcbd88088dc0a46a7.tar.gz
libvpx-656166ea81ddc8c4af06afadcbd88088dc0a46a7.tar.bz2
libvpx-656166ea81ddc8c4af06afadcbd88088dc0a46a7.zip
Merge "Remove avoid_frame_with_high_error from RD loop"
Diffstat (limited to 'vp9/encoder/vp9_onyx_if.c')
-rw-r--r--vp9/encoder/vp9_onyx_if.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 1b915be32..6e054bdd0 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -788,7 +788,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->use_lp32x32fdct = 0;
sf->adaptive_motion_search = 0;
sf->adaptive_pred_filter_type = 0;
- sf->use_avoid_tested_higherror = 0;
sf->reference_masking = 0;
sf->use_one_partition_size_always = 0;
sf->less_rectangular_check = 0;
@@ -834,7 +833,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
#else
sf->static_segmentation = 0;
#endif
- sf->use_avoid_tested_higherror = 1;
sf->adaptive_rd_thresh = 1;
sf->recode_loop = (speed < 1);