From 0e3510a31ffd3c383dcbcd9debb19affa350e06c Mon Sep 17 00:00:00 2001 From: Vitor Sessak Date: Mon, 14 Jul 2008 14:41:01 +0000 Subject: [PATCH] Revert r14218. FFMAX is a macro, so sum = FFMAX(1, scalar_product(...)); might calculate the scalar product twice, which is slower. Originally committed as revision 14230 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ra288.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c index 0a1d2e4965..60e985498a 100644 --- a/libavcodec/ra288.c +++ b/libavcodec/ra288.c @@ -69,7 +69,9 @@ static void decode(Real288_internal *glob, float gain, int cb_coef) for (x=0; x < 5; x++) buffer[x] = codetable[cb_coef][x] * sumsum; - sum = FFMAX(1, scalar_product_float(buffer, buffer, 5) / 5); + sum = scalar_product_float(buffer, buffer, 5) / 5; + + sum = FFMAX(sum, 1); /* shift and store */ memmove(glob->lhist, glob->lhist - 1, 10 * sizeof(*glob->lhist));