diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-11-25 10:20:53 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-25 10:20:53 -0800 |
| commit | 3183135dd39e42eb83d726aa5a8dc79ab1bd992e (patch) | |
| tree | c8cf2473abd4c0954bcf193d33731e7cb60b6045 /vp9/common | |
| parent | 0c54beb1eeaae20caa557b6b0d0e4b67e72688d5 (diff) | |
| parent | 86368faca91b01528e32a1b7d46487dedb8ec538 (diff) | |
| download | libvpx-3183135dd39e42eb83d726aa5a8dc79ab1bd992e.tar libvpx-3183135dd39e42eb83d726aa5a8dc79ab1bd992e.tar.gz libvpx-3183135dd39e42eb83d726aa5a8dc79ab1bd992e.tar.bz2 libvpx-3183135dd39e42eb83d726aa5a8dc79ab1bd992e.zip | |
Merge "Fix a build issue with visual c."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_findnearmv.c | 10 |
1 files changed, 6 insertions, 4 deletions
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) { |