ref: 41a17f445701e35003d7f874af60a6b2f7e66c87
parent: 330a6b27567c4d0e4c8e3548a339f21a6168ba69
parent: 08cdd006e1b25a9d803bfd13c4fb1400f3e4ca93
author: Jingning Han <jingning@google.com>
date: Wed Oct 22 14:46:20 EDT 2014
Merge "Allow checking zeromv mode in vp9_pick_inter_mode"
--- a/vp9/encoder/vp9_pickmode.c
+++ b/vp9/encoder/vp9_pickmode.c
@@ -599,8 +599,7 @@
int rate_mv = 0;
int mode_rd_thresh;
- if (const_motion[ref_frame] &&
- (this_mode == NEARMV || this_mode == ZEROMV))
+ if (const_motion[ref_frame] && this_mode == NEARMV)
continue;
if (!(cpi->sf.inter_mode_mask[bsize] & (1 << this_mode)))