Merge "Move pred_mv assign outside integral projection motion search"
This commit is contained in:
commit
d2b6a4cc80
@ -588,6 +588,7 @@ static void choose_partitioning(VP9_COMP *cpi,
|
||||
bsize = BLOCK_32X32;
|
||||
|
||||
y_sad = vp9_int_pro_motion_estimation(cpi, x, bsize);
|
||||
x->pred_mv[LAST_FRAME] = mbmi->mv[0].as_mv;
|
||||
#endif
|
||||
|
||||
vp9_build_inter_predictors_sb(xd, mi_row, mi_col, BLOCK_64X64);
|
||||
|
@ -1855,7 +1855,6 @@ unsigned int vp9_int_pro_motion_estimation(const VP9_COMP *cpi, MACROBLOCK *x,
|
||||
}
|
||||
tmp_mv->row *= 8;
|
||||
tmp_mv->col *= 8;
|
||||
x->pred_mv[LAST_FRAME] = *tmp_mv;
|
||||
|
||||
return best_sad;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user