diff options
| author | Jingning Han <jingning@google.com> | 2014-10-22 18:46:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-10-22 18:46:20 -0700 |
| commit | 41a17f445701e35003d7f874af60a6b2f7e66c87 (patch) | |
| tree | 03ae5714bb3cbe6ff1bf2e605f567b38bda37985 /vp9/encoder | |
| parent | 330a6b27567c4d0e4c8e3548a339f21a6168ba69 (diff) | |
| parent | 08cdd006e1b25a9d803bfd13c4fb1400f3e4ca93 (diff) | |
| download | libvpx-41a17f445701e35003d7f874af60a6b2f7e66c87.tar libvpx-41a17f445701e35003d7f874af60a6b2f7e66c87.tar.gz libvpx-41a17f445701e35003d7f874af60a6b2f7e66c87.tar.bz2 libvpx-41a17f445701e35003d7f874af60a6b2f7e66c87.zip | |
Merge "Allow checking zeromv mode in vp9_pick_inter_mode"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 6b92af2db..1826885c7 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -599,8 +599,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, 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))) |