Merge commit '566b7a20'

* commit '566b7a20': x86: float dsp: butterflies_float SSE Conflicts: libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit '566b7a20'
* commit '566b7a20': x86: float dsp: butterflies_float SSE Conflicts: libavutil/x86/float_dsp.asm Merged-by: Michael Niedermayer <michaelni@gmx.at>
e91339cd · Michael Niedermayer · 550defe1 · 566b7a20 · e91339cd
Commit e91339cd authored May 03, 2013 by Michael Niedermayer
Show whitespace changes
Inline Side-by-side

Showing with 17 additions and 15 deletions

float_dsp.asm libavutil/x86/float_dsp.asm +17 -15

No files found.
--- a/libavutil/x86/float_dsp.asm
+++ b/libavutil/x86/float_dsp.asm
@@ -268,7 +268,9 @@ cglobal scalarproduct_float, 3,3,2, v1, v2, offset
 ;-----------------------------------------------------------------------------
 INIT_XMM sse
 cglobal butterflies_float, 3,3,3, src0, src1, len
-    movsxdifnidn lenq, lend
+%if ARCH_X86_64
+    movsxd    lenq, lend
+%endif
    test      lenq, lenq
    jz .end
    shl       lenq, 2