# HG changeset patch # User vitor # Date 1216046461 0 # Node ID c5bcb9e4c5b2d0449fe463fc46c31fbd5b926c98 # Parent 25914f8a9bb3ed37bcf6e7fe2dc749f70e51ba82 Revert r14218. FFMAX is a macro, so sum = FFMAX(1, scalar_product(...)); might calculate the scalar product twice, which is slower. diff -r 25914f8a9bb3 -r c5bcb9e4c5b2 ra288.c --- a/ra288.c Sun Jul 13 23:34:29 2008 +0000 +++ b/ra288.c Mon Jul 14 14:41:01 2008 +0000 @@ -69,7 +69,9 @@ 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));