shithub: libvpx

Download patch

ref: fdad4fd226f6aeb9107478501537e1c4b6e2f748
parent: 16f5607dfef1041e507a7f755a1f937b7cd52242
author: Jingning Han <jingning@google.com>
date: Tue Jan 7 05:15:51 EST 2014

Remove deprecated variable from rt_speed_feature

This resolves a merge error.

Change-Id: Ifb83acc0a08e80c82f7624f9c86f79d3a86cc871

--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -585,7 +585,6 @@
                                  SPEED_FEATURES *sf,
                                  int speed) {
   sf->static_segmentation = 0;
-  sf->use_avoid_tested_higherror = 1;
   sf->adaptive_rd_thresh = 1;
   sf->recode_loop = (speed < 1);
   if (speed >= 1) {
--