Enable build with vs20013

Change-Id: I0592b9e92c3ca45e0a81d9ce49a9f2381bec3e39

diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c
index 7b6783a96b7a8744062491e352f45ba452d17149..8dce726900fba6abee650abc5a13e16478968fc8 100644 (file)
--- a/vp9/encoder/vp9_rdopt.c
+++ b/vp9/encoder/vp9_rdopt.c
@@ -4365,8 +4365,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
   int i;
   int refs[2] = { mbmi->ref_frame[0],
     (mbmi->ref_frame[1] < 0 ? 0 : mbmi->ref_frame[1]) };
-  int_mv ref_mv[2] =
-    { mbmi->ref_mvs[refs[0]][0], mbmi->ref_mvs[refs[1]][0] };
+  int_mv ref_mv[2];
   int_mv cur_mv[2];
 #if CONFIG_VP9_HIGHBITDEPTH
   DECLARE_ALIGNED_ARRAY(16, uint16_t, tmp_buf16, MAX_MB_PLANE * 64 * 64);
@@ -4407,6 +4406,9 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
 #endif  // CONFIG_WEDGE_PARTITION
 #endif  // CONFIG_INTERINTRA
 
+  ref_mv[0] = mbmi->ref_mvs[refs[0]][0];
+  ref_mv[1] = mbmi->ref_mvs[refs[1]][0];
+
 #if CONFIG_WEDGE_PARTITION
   mbmi->use_wedge_interinter = 0;
   *compmode_wedge_cost = 0;