diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-08 12:53:44 +0200 |
| commit | 7beadfe1f7777574e99fd4cf6bcd7abad4fb4089 (patch) | |
| tree | 48b177a5d395f894b8ad8b99086cecf4271aedb5 /libavutil | |
| parent | 8a0118b4b49460fb2d33b3fac765c7131816ecc7 (diff) | |
| parent | 7b699d813681e4fad419ec63c96d595e98b2dbfa (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov_chan: Only set the channel_layout if setting it to a nonzero value
mov_chan: Reindent an incorrectly indented line
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
x86: float_dsp: fix ff_vector_fmac_scalar_avx() on Win64
x86: more specific checks for availability of required assembly capabilities
x86: avcodec: Drop silly "_mmx" suffix from dsputil template names
fate: Drop redundant setting of FUZZ to 1
cavsdsp: set idct permutation independently of dsputil
x86: allow using add_hfyu_median_prediction_cmov on any cpu with cmov
Conflicts:
libavcodec/x86/dsputil_mmx.c
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/float_dsp.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm index f1fd01b966..3af928f8b6 100644 --- a/libavutil/x86/float_dsp.asm +++ b/libavutil/x86/float_dsp.asm @@ -62,12 +62,12 @@ cglobal vector_fmac_scalar, 3,3,3, dst, src, len %else cglobal vector_fmac_scalar, 4,4,3, dst, src, mul, len %endif -%if WIN64 - SWAP 0, 2 -%endif %if ARCH_X86_32 VBROADCASTSS m0, mulm %else +%if WIN64 + mova xmm0, xmm2 +%endif shufps xmm0, xmm0, 0 %if cpuflag(avx) vinsertf128 m0, m0, xmm0, 1 |