Commit d070aa5d authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "changed to use correct pred_mv"

parents 2d70e165 0e53d520
......@@ -76,8 +76,11 @@ static void full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
return;
}
}
mvp_full = mbmi->ref_mvs[ref][x->mv_best_ref_index[ref]].as_mv;
assert(x->mv_best_ref_index[ref] <= 2);
if (x->mv_best_ref_index[ref] < 2)
mvp_full = mbmi->ref_mvs[ref][x->mv_best_ref_index[ref]].as_mv;
else
mvp_full = x->pred_mv[ref].as_mv;
mvp_full.col >>= 3;
mvp_full.row >>= 3;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment