Merge "Move pred_mv assign outside integral projection motion search"

[libvpx] / vp9 / encoder / vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 4949997db7574a16dd4fb88c36de49a3b3794b60..1fea4f3744586d6ec2c8159bd7ef6754037e2e0f 100644 (file)
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -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);