ref: 3183135dd39e42eb83d726aa5a8dc79ab1bd992e
parent: 0c54beb1eeaae20caa557b6b0d0e4b67e72688d5
parent: 86368faca91b01528e32a1b7d46487dedb8ec538
author: Yaowu Xu <yaowu@google.com>
date: Mon Nov 25 05:20:53 EST 2013
Merge "Fix a build issue with visual c."
--- a/vp9/common/vp9_findnearmv.c
+++ b/vp9/common/vp9_findnearmv.c
@@ -63,10 +63,12 @@
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) {
--
⑨