aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-05 23:52:01 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-12 17:10:36 +0100
commit25da8d84a46ef262a979d62ca9c58432dcdb2ccf (patch)
tree2ca2a6e6091927d93ce99063b6a8d36983cfd2fd
parent0f642909d866c5189677b1ec864c777a6da49963 (diff)
downloadffmpeg-25da8d84a46ef262a979d62ca9c58432dcdb2ccf.tar.gz
avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 prototypes more similar
This is needed as the mmx code is used as fallback from the ssse3 code Suggested-by: jamrial Tested-by: wm4 Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3b4ffba3af968ae702e3a44f6b5f53445efc7363) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/lossless_audiodsp.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/x86/lossless_audiodsp.asm b/libavcodec/x86/lossless_audiodsp.asm
index 39395fecca..5dff835902 100644
--- a/libavcodec/x86/lossless_audiodsp.asm
+++ b/libavcodec/x86/lossless_audiodsp.asm
@@ -122,7 +122,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,5,10, v1, v2, v3, order, mul
+cglobal scalarproduct_and_madd_int16, 4,4,10, v1, v2, v3, order, mul
test orderq, 8
jnz scalarproduct_and_madd_int16_fallback
shl orderq, 1