diff options
| author | Jingning Han <jingning@google.com> | 2014-12-05 17:35:04 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-05 17:35:04 -0800 |
| commit | 296afb944058f492114b26b0b7ca243f2f342308 (patch) | |
| tree | cb9d1d4114daea3d45006d022cea4957f1f85e9b /vp9/encoder | |
| parent | 3d8d1e374e34697c8d14e5b4f466c562d8e087fc (diff) | |
| parent | eadffb2d6edd4d369533ae5688e389bbd4f63c6a (diff) | |
| download | libvpx-296afb944058f492114b26b0b7ca243f2f342308.tar libvpx-296afb944058f492114b26b0b7ca243f2f342308.tar.gz libvpx-296afb944058f492114b26b0b7ca243f2f342308.tar.bz2 libvpx-296afb944058f492114b26b0b7ca243f2f342308.zip | |
Merge "Fix a motion search skip condition in vp9_pick_inter_mode"
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 727ae4a64..cd654cf4b 100644 --- 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], |