From 8dead2aaca4aa8b84b77b05745755afb56b7d37a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 22 Mar 2016 15:33:28 +0100 Subject: Move const qualifier before type name --- libavcodec/aacpsy.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/aacpsy.c') diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index af567061e0..6cfae6bdbd 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -796,7 +796,7 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, if (la) { float hpfsmpl[AAC_BLOCK_SIZE_LONG]; - float const *pf = hpfsmpl; + const float *pf = hpfsmpl; float attack_intensity[(AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS]; float energy_subshort[(AAC_NUM_BLOCKS_SHORT + 1) * PSY_LAME_NUM_SUBBLOCKS]; float energy_short[AAC_NUM_BLOCKS_SHORT + 1] = { 0 }; @@ -826,7 +826,7 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, } for (i = 0; i < AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS; i++) { - float const *const pfe = pf + AAC_BLOCK_SIZE_LONG / (AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS); + const float *const pfe = pf + AAC_BLOCK_SIZE_LONG / (AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS); float p = 1.0f; for (; pf < pfe; pf++) p = FFMAX(p, fabsf(*pf)); @@ -859,9 +859,9 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, const float *audio, /* GB: tuned (1) to avoid too many short blocks for test sample TRUMPET */ /* RH: tuned (2) to let enough short blocks through for test sample FSOL and SNAPS */ for (i = 1; i < AAC_NUM_BLOCKS_SHORT + 1; i++) { - float const u = energy_short[i - 1]; - float const v = energy_short[i]; - float const m = FFMAX(u, v); + const float u = energy_short[i - 1]; + const float v = energy_short[i]; + const float m = FFMAX(u, v); if (m < 40000) { /* (2) */ if (u < 1.7f * v && v < 1.7f * u) { /* (1) */ if (i == 1 && attacks[0] < attacks[i]) -- cgit v1.2.3