Merge "VP9: handle_inter_mode()... Use interp_filter"

This commit is contained in:
Scott LaVarnway 2016-06-29 11:41:51 +00:00 committed by Gerrit Code Review
commit 74bb78df82

View File

@ -2465,9 +2465,9 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
if (pred_filter_search) { if (pred_filter_search) {
INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE; INTERP_FILTER af = SWITCHABLE, lf = SWITCHABLE;
if (xd->above_mi) if (xd->above_mi && is_inter_block(xd->above_mi))
af = xd->above_mi->interp_filter; af = xd->above_mi->interp_filter;
if (xd->left_mi) if (xd->left_mi && is_inter_block(xd->left_mi))
lf = xd->left_mi->interp_filter; lf = xd->left_mi->interp_filter;
if ((this_mode != NEWMV) || (af == lf)) if ((this_mode != NEWMV) || (af == lf))