diff options
| author | James Zern <jzern@google.com> | 2014-08-16 16:47:44 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2014-09-05 19:22:53 -0700 |
| commit | 94968c6d1470ec0e08a3eeb011d661bcf1915b21 (patch) | |
| tree | 1487f9475c7304ef9c176b222285d59956c4f63e /vp9 | |
| parent | 89963bf586d818be20be21b27772af0768e15121 (diff) | |
| download | libvpx-94968c6d1470ec0e08a3eeb011d661bcf1915b21.tar libvpx-94968c6d1470ec0e08a3eeb011d661bcf1915b21.tar.gz libvpx-94968c6d1470ec0e08a3eeb011d661bcf1915b21.tar.bz2 libvpx-94968c6d1470ec0e08a3eeb011d661bcf1915b21.zip | |
vp9_pickmode: make vp9_pick_inter_mode() void
the previous return value was constant and unused.
Change-Id: Ic3be55edb4a884448c7bb07977a80dfb58b7b940
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_pickmode.c | 16 | ||||
| -rw-r--r-- | vp9/encoder/vp9_pickmode.h | 14 |
2 files changed, 14 insertions, 16 deletions
diff --git a/vp9/encoder/vp9_pickmode.c b/vp9/encoder/vp9_pickmode.c index eee6ffe13..1ed4029e7 100644 --- a/vp9/encoder/vp9_pickmode.c +++ b/vp9/encoder/vp9_pickmode.c @@ -402,13 +402,13 @@ static const THR_MODES mode_idx[MAX_REF_FRAMES - 1][INTER_MODES] = { // TODO(jingning) placeholder for inter-frame non-RD mode decision. // this needs various further optimizations. to be continued.. -int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, - const TileInfo *const tile, - int mi_row, int mi_col, - int *returnrate, - int64_t *returndistortion, - BLOCK_SIZE bsize, - PICK_MODE_CONTEXT *ctx) { +void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, + const TileInfo *const tile, + int mi_row, int mi_col, + int *returnrate, + int64_t *returndistortion, + BLOCK_SIZE bsize, + PICK_MODE_CONTEXT *ctx) { MACROBLOCKD *xd = &x->e_mbd; MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi; struct macroblockd_plane *const pd = &xd->plane[0]; @@ -761,6 +761,4 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, if (cpi->sf.reuse_inter_pred_sby) pd->dst = orig_dst; } - - return INT64_MAX; } diff --git a/vp9/encoder/vp9_pickmode.h b/vp9/encoder/vp9_pickmode.h index 49c6feb88..0beb154ed 100644 --- a/vp9/encoder/vp9_pickmode.h +++ b/vp9/encoder/vp9_pickmode.h @@ -23,13 +23,13 @@ typedef struct { int in_use; } PRED_BUFFER; -int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, - const struct TileInfo *const tile, - int mi_row, int mi_col, - int *returnrate, - int64_t *returndistortion, - BLOCK_SIZE bsize, - PICK_MODE_CONTEXT *ctx); +void vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x, + const struct TileInfo *const tile, + int mi_row, int mi_col, + int *returnrate, + int64_t *returndistortion, + BLOCK_SIZE bsize, + PICK_MODE_CONTEXT *ctx); #ifdef __cplusplus } // extern "C" |