summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2013-10-14 13:36:57 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2013-10-14 13:37:26 (GMT)
commit12ca544aa0fc825ce663af013b13ca5d7c05e46b (patch)
treedbeae280cd969b0e1edc67def0333bba5905f52f
parent953dd72321b7eb651351eb46d7c333cb097d18bb (diff)
parent15748773bf33c110e6e2e9526c7ba5478274c74c (diff)
downloadffmpeg-12ca544aa0fc825ce663af013b13ca5d7c05e46b.zip
ffmpeg-12ca544aa0fc825ce663af013b13ca5d7c05e46b.tar.gz
ffmpeg-12ca544aa0fc825ce663af013b13ca5d7c05e46b.tar.bz2
Merge commit '15748773bf33c110e6e2e9526c7ba5478274c74c'
* commit '15748773bf33c110e6e2e9526c7ba5478274c74c': avresample/x86: Switch operand order for mulps Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--libavresample/x86/audio_mix.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavresample/x86/audio_mix.asm b/libavresample/x86/audio_mix.asm
index 8675dda..982a135 100644
--- a/libavresample/x86/audio_mix.asm
+++ b/libavresample/x86/audio_mix.asm
@@ -428,7 +428,7 @@ cglobal mix_%1_to_%2_%3_flt, 3,in_channels+2,needed_mmregs+matrix_elements_mm, n
%if stereo || mx_stack_0_0
mulps m0, m0, mx_0_0
%else
- mulps m0, [src0q+lenq], mx_0_0
+ mulps m0, mx_0_0, [src0q+lenq]
%endif
%assign %%i 1
%rep (in_channels - 1)