summaryrefslogtreecommitdiff
path: root/libavcodec/x86/fmtconvert.asm
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-11-01 16:57:41 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2011-11-02 21:44:58 -0400
commit5463e83dbc9825f3962118f0d3328be82aea3308 (patch)
tree74a394e1fcef8ca2bfdb13ffbe24c4d39661b9ee /libavcodec/x86/fmtconvert.asm
parent594b54b51e9f3af8aac18184d634b85a836b42b6 (diff)
downloadffmpeg-5463e83dbc9825f3962118f0d3328be82aea3308.tar.gz
fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64
The calling convention only allows 4 non-stack parameter, with each float or int register being skipped if not used. fixes Bug 64
Diffstat (limited to 'libavcodec/x86/fmtconvert.asm')
-rw-r--r--libavcodec/x86/fmtconvert.asm6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm
index 854954835c..d6210897f6 100644
--- a/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@@ -28,10 +28,14 @@ SECTION_TEXT
; void int32_to_float_fmul_scalar(float *dst, const int *src, float mul, int len);
;---------------------------------------------------------------------------------
%macro INT32_TO_FLOAT_FMUL_SCALAR 2
-%ifdef ARCH_X86_64
+%ifdef UNIX64
cglobal int32_to_float_fmul_scalar_%1, 3,3,%2, dst, src, len
%else
cglobal int32_to_float_fmul_scalar_%1, 4,4,%2, dst, src, mul, len
+%endif
+%ifdef WIN64
+ SWAP 0, 2
+%elifdef ARCH_X86_32
movss m0, mulm
%endif
SPLATD m0