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

diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 0a1d2e4..60e9854 100644 (file)
--- 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));