diff options
| author | Johann <johannkoenig@google.com> | 2014-01-08 17:42:04 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2014-01-08 19:31:24 -0800 |
| commit | 719dadf3ef144cf1522782aefeee1bc068162932 (patch) | |
| tree | 372d2f47997ef66a4273da310c4e7a7022969fe7 | |
| parent | 67ad03acc36dd690b9e9b86af39203a12accad23 (diff) | |
| download | libvpx-719dadf3ef144cf1522782aefeee1bc068162932.tar libvpx-719dadf3ef144cf1522782aefeee1bc068162932.tar.gz libvpx-719dadf3ef144cf1522782aefeee1bc068162932.tar.bz2 libvpx-719dadf3ef144cf1522782aefeee1bc068162932.zip | |
Use the correct member for initialization
On Windows this fails with:
error C2440: 'initializing': cannot convert from int_mv to uint32_t
Change-Id: I51630efd0e83a0ce620c91aa7859dd6fc1572e99
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 97dc1e0ff..5ca34795d 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -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; |