From 6381f913d19d78513bab06fad7c50548975475a3 Mon Sep 17 00:00:00 2001 From: Nathan Caldwell Date: Sat, 7 Jan 2012 14:21:35 -0700 Subject: aacpsy: Replace an if with FFMAX in LAME windowing. Signed-off-by: Alex Converse --- libavcodec/aacpsy.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libavcodec/aacpsy.c') 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. -- cgit v1.2.3