ref: 296afb944058f492114b26b0b7ca243f2f342308
parent: 3d8d1e374e34697c8d14e5b4f466c562d8e087fc
parent: eadffb2d6edd4d369533ae5688e389bbd4f63c6a
author: Jingning Han <jingning@google.com>
date: Fri Dec 5 12:35:04 EST 2014
Merge "Fix a motion search skip condition in vp9_pick_inter_mode"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -687,7 +687,7 @@
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],