[FFmpeg-cvslog] avcodec/x86/lossless_audiodsp: Make scalarproduct_and_madd_int16 prototypes more similar

Michael Niedermayer git at videolan.org
Thu Feb 12 18:11:56 CET 2015


ffmpeg | branch: release/2.5 | Michael Niedermayer <michaelni at gmx.at> | Thu Feb  5 23:52:01 2015 +0100| [25da8d84a46ef262a979d62ca9c58432dcdb2ccf] | committer: Michael Niedermayer

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 at gmx.at>
(cherry picked from commit 3b4ffba3af968ae702e3a44f6b5f53445efc7363)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=25da8d84a46ef262a979d62ca9c58432dcdb2ccf
---

 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 39395fe..5dff835 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



More information about the ffmpeg-cvslog mailing list