Merge "Remove unused speed feature"

diff --cc vp9/encoder/vp9_rdopt.c
Simple merge

diff --cc vp9/encoder/vp9_speed_features.c
index 889a8be,d0a3c30..7ddeac7
--- 1/vp9/encoder/vp9_speed_features.c
--- 2/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@@ -123,12 -130,10 +123,11 @@@ static void set_good_speed_feature(VP9_
      sf->use_square_partition_only = 1;
      sf->tx_size_search_method = USE_LARGESTALL;
      sf->disable_split_mask = DISABLE_ALL_SPLIT;
 +    sf->mv.search_method = BIGDIA;
 +    sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED;
      sf->adaptive_rd_thresh = 4;
-     sf->mode_search_skip_flags |= FLAG_SKIP_COMP_REFMISMATCH |
-                                   FLAG_EARLY_TERMINATE;
+     sf->mode_search_skip_flags |= FLAG_EARLY_TERMINATE;
      sf->disable_filter_search_var_thresh = 200;
 -    sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_ALL;
      sf->use_lp32x32fdct = 1;
      sf->use_fast_coef_updates = ONE_LOOP_REDUCED;
      sf->use_fast_coef_costing = 1;