Commit e8192cf6 authored by Johann's avatar Johann Committed by Gerrit Code Review
Browse files

Merge "Use the correct member for initialization"

parents b1d81e19 719dadf3
...@@ -2124,10 +2124,10 @@ static void mv_pred(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -2124,10 +2124,10 @@ static void mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
cpi->common.show_frame && cpi->common.show_frame &&
block_size < cpi->sf.max_partition_size); block_size < cpi->sf.max_partition_size);
int_mv pred_mv[3] = { int_mv pred_mv[3];
mbmi->ref_mvs[ref_frame][0], mbmi->ref_mvs[ref_frame][1], pred_mv[0] = mbmi->ref_mvs[ref_frame][0];
x->pred_mv[ref_frame] pred_mv[1] = mbmi->ref_mvs[ref_frame][1];
}; pred_mv[2] = x->pred_mv[ref_frame];
// Get the sad for each candidate reference mv // Get the sad for each candidate reference mv
for (i = 0; i < num_mv_refs; i++) { for (i = 0; i < num_mv_refs; i++) {
...@@ -2355,9 +2355,10 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -2355,9 +2355,10 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
YV12_BUFFER_CONFIG *scaled_ref_frame = get_scaled_ref_frame(cpi, ref); YV12_BUFFER_CONFIG *scaled_ref_frame = get_scaled_ref_frame(cpi, ref);
int_mv pred_mv[3] = { int_mv pred_mv[3];
mbmi->ref_mvs[ref][0], mbmi->ref_mvs[ref][1], x->pred_mv[ref] pred_mv[0] = mbmi->ref_mvs[ref][0];
}; pred_mv[1] = mbmi->ref_mvs[ref][1];
pred_mv[2] = x->pred_mv[ref];
if (scaled_ref_frame) { if (scaled_ref_frame) {
int i; int i;
......
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