Revert "avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 prototypes...
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Feb 2015 01:31:45 +0000 (02:31 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 6 Feb 2015 01:31:45 +0000 (02:31 +0100)
This reverts commit 3b4ffba3af968ae702e3a44f6b5f53445efc7363.

Unbreaks the SSSE3 code on mingw32

Conflicts:

libavcodec/x86/lossless_audiodsp.asm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/x86/lossless_audiodsp.asm

index 084ed9a..64b769f 100644 (file)
@@ -116,7 +116,7 @@ align 16
 ; int ff_scalarproduct_and_madd_int16(int16_t *v1, int16_t *v2, int16_t *v3,
 ;                                     int order, int mul)
 INIT_XMM ssse3
-cglobal scalarproduct_and_madd_int16, 4,4,10, v1, v2, v3, order, mul
+cglobal scalarproduct_and_madd_int16, 4,5,10, v1, v2, v3, order, mul
     shl orderq, 1
     movd    m7, mulm
     pshuflw m7, m7, 0