diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-03-01 20:50:33 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-01 20:50:33 -0800 |
| commit | 2d3e879fccef330d89f5e5ae6c718cb37d888d2a (patch) | |
| tree | 748d939cd5d861745ea7c7f2e08e38794415027e /vp8/encoder/pickinter.c | |
| parent | e189edfeb11d3433c8ca3c35fe8d5610ef2444f3 (diff) | |
| parent | 1cfc86ebe041b3894d33b50d54db94dcb7ea3684 (diff) | |
| download | libvpx-2d3e879fccef330d89f5e5ae6c718cb37d888d2a.tar libvpx-2d3e879fccef330d89f5e5ae6c718cb37d888d2a.tar.gz libvpx-2d3e879fccef330d89f5e5ae6c718cb37d888d2a.tar.bz2 libvpx-2d3e879fccef330d89f5e5ae6c718cb37d888d2a.zip | |
Merge changes If5896507,I06b5ba5c,I2712f99e into experimental
* changes:
Add unit test for x4 multi-SAD functions
Add VP9 1 block SAD functions to unit test
Merge master branch into experimental
Diffstat (limited to 'vp8/encoder/pickinter.c')
| -rw-r--r-- | vp8/encoder/pickinter.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 673de2b33..4c2527d68 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -389,7 +389,7 @@ static void pick_intra_mbuv_mode(MACROBLOCK *mb) } -static void update_mvcount(VP8_COMP *cpi, MACROBLOCK *x, int_mv *best_ref_mv) +static void update_mvcount(MACROBLOCK *x, int_mv *best_ref_mv) { MACROBLOCKD *xd = &x->e_mbd; /* Split MV modes currently not supported when RD is nopt enabled, @@ -1241,7 +1241,7 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, != cpi->common.ref_frame_sign_bias[xd->mode_info_context->mbmi.ref_frame]) best_ref_mv.as_int = best_ref_mv_sb[!sign_bias].as_int; - update_mvcount(cpi, x, &best_ref_mv); + update_mvcount(x, &best_ref_mv); } |