shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Move pred_mv assign outside integral projection motion search"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -588,6 +588,7 @@

       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);

--- a/vp9/encoder/vp9_mcomp.c

+++ b/vp9/encoder/vp9_mcomp.c

@@ -1855,7 +1855,6 @@

   }

   tmp_mv->row *= 8;

   tmp_mv->col *= 8;

-  x->pred_mv[LAST_FRAME] = *tmp_mv;

   return best_sad;

 }