diff options
| author | Alex Converse <aconverse@google.com> | 2015-03-05 13:54:44 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2015-03-05 13:54:44 -0800 |
| commit | ad01d275e9836dcce72d5192a23f41f714605600 (patch) | |
| tree | 8ccb1b3e9e607dbdd674bd915994b7975f7c46dd /vp9/encoder | |
| parent | 6e3be5c3b6fad4f8b1a3aa9f43efcdf4cf2898b2 (diff) | |
| parent | 2eb113d00a1596255a7158ecb6f9b7c96bfe2ef6 (diff) | |
| download | libvpx-ad01d275e9836dcce72d5192a23f41f714605600.tar libvpx-ad01d275e9836dcce72d5192a23f41f714605600.tar.gz libvpx-ad01d275e9836dcce72d5192a23f41f714605600.tar.bz2 libvpx-ad01d275e9836dcce72d5192a23f41f714605600.zip | |
Merge "Don't inline cost_coeffs."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 79d1f9c5e..51397a791 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -328,12 +328,12 @@ static const int16_t band_counts[TX_SIZES][8] = { { 1, 2, 3, 4, 11, 256 - 21, 0 }, { 1, 2, 3, 4, 11, 1024 - 21, 0 }, }; -static INLINE int cost_coeffs(MACROBLOCK *x, - int plane, int block, - ENTROPY_CONTEXT *A, ENTROPY_CONTEXT *L, - TX_SIZE tx_size, - const int16_t *scan, const int16_t *nb, - int use_fast_coef_costing) { +static int cost_coeffs(MACROBLOCK *x, + int plane, int block, + ENTROPY_CONTEXT *A, ENTROPY_CONTEXT *L, + TX_SIZE tx_size, + const int16_t *scan, const int16_t *nb, + int use_fast_coef_costing) { MACROBLOCKD *const xd = &x->e_mbd; MB_MODE_INFO *mbmi = &xd->mi[0].src_mi->mbmi; const struct macroblock_plane *p = &x->plane[plane]; |