diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 16:36:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-08 16:36:47 +0100 |
| commit | 5c076205a67d44c9e28ce5a74b55d281d1a3c106 (patch) | |
| tree | 56824e88a7c7a208864a04ec3a4659d5e7fd1bcb /libavutil/x86/float_dsp.asm | |
| parent | 1a4250493b3aae4ca366092fb0922e7c098f478c (diff) | |
| parent | 9a2e79116d6235c53d8e9663a8d30d1950d7431a (diff) | |
| download | ffmpeg-5c076205a67d44c9e28ce5a74b55d281d1a3c106.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
golomb: use unsigned arithmetics in svq3_get_ue_golomb()
x86: float_dsp: fix loading of the len parameter on x86-32
takdec: fix initialisation of LOCAL_ALIGNED array
takdec: fix initialisation of LOCAL_ALIGNED array
Conflicts:
libavcodec/rv30.c
libavcodec/svq3.c
libavcodec/takdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86/float_dsp.asm')
| -rw-r--r-- | libavutil/x86/float_dsp.asm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm index e01e1a8822..b6892d4e10 100644 --- a/libavutil/x86/float_dsp.asm +++ b/libavutil/x86/float_dsp.asm @@ -127,7 +127,10 @@ VECTOR_FMUL_SCALAR ;------------------------------------------------------------------------------ %macro VECTOR_DMUL_SCALAR 0 -%if UNIX64 +%if ARCH_X86_32 +cglobal vector_dmul_scalar, 3,4,3, dst, src, mul, len, lenaddr + mov lenq, lenaddrm +%elif UNIX64 cglobal vector_dmul_scalar, 3,3,3, dst, src, len %else cglobal vector_dmul_scalar, 4,4,3, dst, src, mul, len |