From: Yaowu Xu Date: Mon, 25 Nov 2013 16:11:35 +0000 (-0800) Subject: Fix a build issue with visual c. X-Git-Tag: v1.4.0~2957^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86368faca91b01528e32a1b7d46487dedb8ec538;p=libvpx Fix a build issue with visual c. Change-Id: Ic8fc16ee1734cfde0d12a2e3abb3e9299382f3b1 --- diff --git a/vp9/common/vp9_findnearmv.c b/vp9/common/vp9_findnearmv.c index 66178cd1b..ad97c0277 100644 --- a/vp9/common/vp9_findnearmv.c +++ b/vp9/common/vp9_findnearmv.c @@ -63,10 +63,12 @@ void vp9_append_sub8x8_mvs_for_idx(VP9_COMMON *cm, MACROBLOCKD *xd, break; } } else { - int_mv candidates[2 + MAX_MV_REF_CANDIDATES] = { bmi[1].as_mv[ref_idx], - bmi[0].as_mv[ref_idx], - mv_list[0], - mv_list[1] }; + int_mv candidates[2 + MAX_MV_REF_CANDIDATES]; + candidates[0] = bmi[1].as_mv[ref_idx]; + candidates[1] = bmi[0].as_mv[ref_idx]; + candidates[2] = mv_list[0]; + candidates[3] = mv_list[1]; + assert(block_idx == 3); dst_nearest->as_int = bmi[2].as_mv[ref_idx].as_int; for (n = 0; n < 2 + MAX_MV_REF_CANDIDATES; ++n) {