diff options
| author | Nathan Caldwell <saintdev@gmail.com> | 2012-01-07 14:21:35 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2012-01-23 11:40:45 -0800 |
| commit | 6381f913d19d78513bab06fad7c50548975475a3 (patch) | |
| tree | 1a7a8fecdbce4954471b5244f4c8b3c09858e75a /libavcodec | |
| parent | 207bf44d161300ec864663371eb65a3e4c8abfca (diff) | |
| download | ffmpeg-6381f913d19d78513bab06fad7c50548975475a3.tar.gz | |
aacpsy: Replace an if with FFMAX in LAME windowing.
Signed-off-by: Alex Converse <alex.converse@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aacpsy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/aacpsy.c b/libavcodec/aacpsy.c index 04feea388c..577d8fba80 100644 --- a/libavcodec/aacpsy.c +++ b/libavcodec/aacpsy.c @@ -823,8 +823,7 @@ static FFPsyWindowInfo psy_lame_window(FFPsyContext *ctx, float const *const pfe = pf + AAC_BLOCK_SIZE_LONG / (AAC_NUM_BLOCKS_SHORT * PSY_LAME_NUM_SUBBLOCKS); float p = 1.0f; for (; pf < pfe; pf++) - if (p < fabsf(*pf)) - p = fabsf(*pf); + p = FFMAX(p, fabsf(*pf)); pch->prev_energy_subshort[i] = energy_subshort[i + PSY_LAME_NUM_SUBBLOCKS] = p; energy_short[1 + i / PSY_LAME_NUM_SUBBLOCKS] += p; /* NOTE: The indexes below are [i + 3 - 2] in the LAME source. |