diff options
author | Jim Bankoski <jimbankoski@google.com> | 2014-02-13 08:31:49 -0800 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-02-13 08:31:49 -0800 |
commit | 6a6797f5c9a9c82cd8b32741e15c6fec3de4513e (patch) | |
tree | 969adfb631ecca827eeb1833a86243cbb48ba585 /vp9/encoder | |
parent | d7be0fd5ea932f7ea9bb992c6bf707b4e6676474 (diff) | |
parent | c6eaf5f9f9cb1dcc215474e7acbfa9fb6ce52a9a (diff) | |
download | libvpx-6a6797f5c9a9c82cd8b32741e15c6fec3de4513e.tar libvpx-6a6797f5c9a9c82cd8b32741e15c6fec3de4513e.tar.gz libvpx-6a6797f5c9a9c82cd8b32741e15c6fec3de4513e.tar.bz2 libvpx-6a6797f5c9a9c82cd8b32741e15c6fec3de4513e.zip |
Merge "vp9_pickmode.c static analysis issues resolved"
Diffstat (limited to 'vp9/encoder')
-rw-r--r-- | vp9/encoder/vp9_pickmode.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index 3b4a7f6e4..912968594 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -98,10 +98,8 @@ static int full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, mvp_full.col >>= 3; mvp_full.row >>= 3; - bestsme = vp9_full_pixel_diamond(cpi, x, &mvp_full, step_param, - sadpb, further_steps, 1, - &cpi->fn_ptr[bsize], - &ref_mv.as_mv, tmp_mv); + vp9_full_pixel_diamond(cpi, x, &mvp_full, step_param, sadpb, further_steps, 1, + &cpi->fn_ptr[bsize], &ref_mv.as_mv, tmp_mv); x->mv_col_min = tmp_col_min; x->mv_col_max = tmp_col_max; |