diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:21:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-07 15:21:41 +0100 |
| commit | af164d7d9f12f9c2a4b284957eb92ad74cd49b3d (patch) | |
| tree | 942f8ceec8738f4436612742a0d08c180c67193d /libavutil | |
| parent | 8ca8b43d7108b9d7e6887fd553d13a71afa670c6 (diff) | |
| parent | c25fc5c2bb6ae8c93541c9427df3e47206d95152 (diff) | |
| download | ffmpeg-af164d7d9f12f9c2a4b284957eb92ad74cd49b3d.tar.gz | |
Merge commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152'
* commit 'c25fc5c2bb6ae8c93541c9427df3e47206d95152':
fate: dpcm: Add dependencies
SBR DSP x86: implement SSE sbr_hf_gen
AAC SBR: use AVFloatDSPContext's vector_fmul
fate: image: Add dependencies
Changelog: add an entry for deprecating the avconv -vol option
x86: float_dsp: fix compilation of ff_vector_dmul_scalar_avx() on x86-32
Conflicts:
Changelog
libavutil/x86/float_dsp.asm
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/float_dsp.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm index 365bafea00..e01e1a8822 100644 --- a/libavutil/x86/float_dsp.asm +++ b/libavutil/x86/float_dsp.asm @@ -133,7 +133,7 @@ cglobal vector_dmul_scalar, 3,3,3, dst, src, len cglobal vector_dmul_scalar, 4,4,3, dst, src, mul, len %endif %if ARCH_X86_32 - VBROADCASTSD m0, mulm + VBROADCASTSD m0, mulm %else %if WIN64 movlhps xmm2, xmm2 |