Commit 1a6ec3c7 authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Change initializations to be compatible with MSVC" into nextgenv2

parents a912c6ec 33993798
...@@ -1515,7 +1515,10 @@ static void read_inter_block_mode_info(VP10Decoder *const pbi, ...@@ -1515,7 +1515,10 @@ static void read_inter_block_mode_info(VP10Decoder *const pbi,
mbmi->mv[1].as_int = mi->bmi[3].as_mv[1].as_int; mbmi->mv[1].as_int = mi->bmi[3].as_mv[1].as_int;
} else { } else {
int ref; int ref;
int_mv ref_mv[2] = { nearestmv[0], nearestmv[1] }; int_mv ref_mv[2];
ref_mv[0] = nearestmv[0];
ref_mv[1] = nearestmv[1];
for (ref = 0; ref < 1 + is_compound && mbmi->mode == NEWMV; ++ref) { for (ref = 0; ref < 1 + is_compound && mbmi->mode == NEWMV; ++ref) {
#if CONFIG_REF_MV #if CONFIG_REF_MV
uint8_t ref_frame_type = vp10_ref_frame_type(mbmi->ref_frame); uint8_t ref_frame_type = vp10_ref_frame_type(mbmi->ref_frame);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment