diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-16 16:56:07 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-16 16:56:07 -0800 |
| commit | 3755be94ed143a957941046c6724e18bdeeda063 (patch) | |
| tree | 000c4b090e975b565aa905000e6bc869ecb041e3 /vp9/encoder/vp9_rdopt.c | |
| parent | bb7b4bad6d462c6c3faf9b8329f6f0019cd1fde2 (diff) | |
| parent | 095b03231c1514ff274cabcd3d8e6447efdb4db8 (diff) | |
| download | libvpx-3755be94ed143a957941046c6724e18bdeeda063.tar libvpx-3755be94ed143a957941046c6724e18bdeeda063.tar.gz libvpx-3755be94ed143a957941046c6724e18bdeeda063.tar.bz2 libvpx-3755be94ed143a957941046c6724e18bdeeda063.zip | |
Merge "Using MV struct instead of int_mv union in encoder (2)."
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 66249d66e..6b3905e04 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2532,11 +2532,11 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, tmp_mv.as_mv.row >>= 3; // Small-range full-pixel motion search - bestsme = vp9_refining_search_8p_c(x, &tmp_mv, sadpb, + bestsme = vp9_refining_search_8p_c(x, &tmp_mv.as_mv, sadpb, search_range, &cpi->fn_ptr[bsize], x->nmvjointcost, x->mvcost, - &ref_mv[id], second_pred, + &ref_mv[id].as_mv, second_pred, pw, ph); x->mv_col_min = tmp_col_min; |