diff options
| author | Jingning Han <jingning@google.com> | 2014-12-10 09:25:12 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-10 09:25:12 -0800 |
| commit | ad19724f1a77dd9a449f316507ce4dc73de8e27a (patch) | |
| tree | b0fb774f219154ac37da1b939951659442d2f522 /vp9 | |
| parent | 6fc289b9c04aee27b66a0cad084ea5d0733e9170 (diff) | |
| parent | 0cac834b5a3ed300f338e30c57652bdb5fe1530e (diff) | |
| download | libvpx-ad19724f1a77dd9a449f316507ce4dc73de8e27a.tar libvpx-ad19724f1a77dd9a449f316507ce4dc73de8e27a.tar.gz libvpx-ad19724f1a77dd9a449f316507ce4dc73de8e27a.tar.bz2 libvpx-ad19724f1a77dd9a449f316507ce4dc73de8e27a.zip | |
Merge "Use use_prev_frame_mvs flag for ref mv search branch"
Diffstat (limited to 'vp9')
| -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 1da5a83bd..b45032456 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -622,7 +622,7 @@ void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, vp9_setup_pred_block(xd, yv12_mb[ref_frame], yv12, mi_row, mi_col, sf, sf); - if (!cm->error_resilient_mode) + if (cm->use_prev_frame_mvs) vp9_find_mv_refs(cm, xd, tile_info, xd->mi[0].src_mi, ref_frame, candidates, mi_row, mi_col); else |