Merge "Fix a motion search skip condition in vp9_pick_inter_mode"

296afb94 · Jingning Han · Gerrit Code Review · 3d8d1e37 · eadffb2d · 296afb94
Commit 296afb94 authored Dec 05, 2014 by Jingning Han Committed by Gerrit Code Review Dec 05, 2014
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -687,7 +687,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
        if (ref_frame > LAST_FRAME)
          continue;
        if (cpi->sf.partition_search_type != VAR_BASED_PARTITION &&
-            this_rdc.rdcost < (int64_t)(1 << num_pels_log2_lookup[bsize]))
+            best_rdc.rdcost < (int64_t)(1 << num_pels_log2_lookup[bsize]))
          continue;
        if (!combined_motion_search(cpi, x, bsize, mi_row, mi_col,
                                    &frame_mv[NEWMV][ref_frame],