generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use the correct member for initialization

Browse Source 
On Windows this fails with:
error C2440: 'initializing': cannot convert from int_mv to uint32_t

Change-Id: I51630efd0e83a0ce620c91aa7859dd6fc1572e99
This commit is contained in:
Johann 2014-01-08 17:42:04 -08:00
parent 67ad03acc3
commit 719dadf3ef
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
vp9/encoder/vp9_rdopt.c
View File

@ -2124,10 +2124,10 @@ static void mv_pred(VP9_COMP *cpi, MACROBLOCK *x,
cpi->common.show_frame &&
block_size < cpi->sf.max_partition_size);
int_mv pred_mv[3] = {
mbmi->ref_mvs[ref_frame][0], mbmi->ref_mvs[ref_frame][1],
x->pred_mv[ref_frame]
};
int_mv pred_mv[3];
pred_mv[0] = mbmi->ref_mvs[ref_frame][0];
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
for (i = 0; i < num_mv_refs; i++) {
@ -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);
int_mv pred_mv[3] = {
mbmi->ref_mvs[ref][0], mbmi->ref_mvs[ref][1], x->pred_mv[ref]
};
int_mv pred_mv[3];
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) {
int i;