diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-06 02:31:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-12 17:10:36 +0100 |
| commit | 09425294c97cb427137c7247cc65d2f9e166e37c (patch) | |
| tree | f559c2bfc0ec539d776a678946a71d85869fc8ac | |
| parent | 3572eaaf02f9611ed6f5c4ccba7e75befaf43ecf (diff) | |
| download | ffmpeg-09425294c97cb427137c7247cc65d2f9e166e37c.tar.gz | |
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 <michaelni@gmx.at>
(cherry picked from commit a6c2c8fe3f076d14c0170b4d1965a0dea0393b8d)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/x86/lossless_audiodsp.asm | 2 |
1 files changed, 1 insertions, 1 deletions
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 |