diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 01:44:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-04 01:44:06 +0100 |
| commit | 259a960f1b74339626f8da890cc261a4043097fe (patch) | |
| tree | aea69b2dcfe4dfabedf82725fecbd2a551412f55 /libavcodec/x86/fmtconvert.asm | |
| parent | bb99ae3ae924c942a634bec7711ec7ee11c38eb9 (diff) | |
| parent | 2a6eb06254df79e96b3d791b6b89b2534ced3119 (diff) | |
| download | ffmpeg-259a960f1b74339626f8da890cc261a4043097fe.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
vp6: Fix illegal read.
avfilter: Don't copy garbage from the stack when setting up video pictures.
avcodec: Make sure codec_type is set by avcodec_get_context_defaults2
avcodec: Remove a misplaced and useless attribute_deprecated
avconv: add -dump_attachment option.
avconv: add -attach option.
avconv: make negative mappings disable only streams from the specified file
fmtconvert: fix int32_to_float_fmul_scalar() for windows x86_64
Conflicts:
libavcodec/options.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/fmtconvert.asm')
| -rw-r--r-- | libavcodec/x86/fmtconvert.asm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index 37e7a094ce..d8838d6922 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 |