From a6c2c8fe3f076d14c0170b4d1965a0dea0393b8d Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 6 Feb 2015 02:31:45 +0100 Subject: [PATCH] Revert "avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 prototypes more similar" This reverts commit 3b4ffba3af968ae702e3a44f6b5f53445efc7363. Unbreaks the SSSE3 code on mingw32 Conflicts: libavcodec/x86/lossless_audiodsp.asm Signed-off-by: Michael Niedermayer --- libavcodec/x86/lossless_audiodsp.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/x86/lossless_audiodsp.asm b/libavcodec/x86/lossless_audiodsp.asm index 084ed9a093..64b769f7d4 100644 --- a/libavcodec/x86/lossless_audiodsp.asm +++ b/libavcodec/x86/lossless_audiodsp.asm @@ -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