diff options
| author | Yaowu Xu <yaowu@google.com> | 2014-05-12 14:56:54 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-05-12 14:56:54 -0700 |
| commit | 38f3cf125efe262f661d4f1e95d6eba0fb349e57 (patch) | |
| tree | f9f2237c3185b838f98d977466beff971f357ebd | |
| parent | 69d2fb856bdcbea975406afb64499b799429e1bf (diff) | |
| parent | 3e81ee26ccefa466c0aff63d3465b3c1dbc1b262 (diff) | |
| download | libvpx-38f3cf125efe262f661d4f1e95d6eba0fb349e57.tar libvpx-38f3cf125efe262f661d4f1e95d6eba0fb349e57.tar.gz libvpx-38f3cf125efe262f661d4f1e95d6eba0fb349e57.tar.bz2 libvpx-38f3cf125efe262f661d4f1e95d6eba0fb349e57.zip | |
Merge "vp9_pickmode.c: Removed unused function parameters"
| -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 adaa04447..78fba73d4 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -27,7 +27,6 @@ #include "vp9/encoder/vp9_rdopt.h" static void full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, - const TileInfo *const tile, BLOCK_SIZE bsize, int mi_row, int mi_col, int_mv *tmp_mv, int *rate_mv) { MACROBLOCKD *xd = &x->e_mbd; @@ -107,7 +106,6 @@ static void full_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, } static void sub_pixel_motion_search(VP9_COMP *cpi, MACROBLOCK *x, - const TileInfo *const tile, BLOCK_SIZE bsize, int mi_row, int mi_col, MV *tmp_mv) { MACROBLOCKD *xd = &x->e_mbd; @@ -290,7 +288,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (this_rd < (int64_t)(1 << num_pels_log2_lookup[bsize])) continue; - full_pixel_motion_search(cpi, x, tile, bsize, mi_row, mi_col, + full_pixel_motion_search(cpi, x, bsize, mi_row, mi_col, &frame_mv[NEWMV][ref_frame], &rate_mv); if (frame_mv[NEWMV][ref_frame].as_int == INVALID_MV) @@ -301,7 +299,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (RDCOST(x->rdmult, x->rddiv, rate_mv + rate_mode, 0) > best_rd) continue; - sub_pixel_motion_search(cpi, x, tile, bsize, mi_row, mi_col, + sub_pixel_motion_search(cpi, x, bsize, mi_row, mi_col, &frame_mv[NEWMV][ref_frame].as_mv); } |