Merge commit '8563f9887194b07c972c3475d6b51592d77f73f7'

* commit '8563f9887194b07c972c3475d6b51592d77f73f7': x86: use emms after ff_int32_to_float_fmul_scalar_sse Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
9 years ago · 2214207d04
parent 0eefc758e2 8563f98871
commit 2214207d04
1 changed files with 8 additions and 1 deletions
--- a/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@ -61,7 +61,14 @@ cglobal int32_to_float_fmul_scalar, 4, 4, %1, dst, src, mul, len
    mova  [dstq+lenq+16], m2
    add     lenq, 32
    jl .loop
-    REP_RET
+%if notcpuflag(sse2)
+    ;; cvtpi2ps switches to MMX even if the source is a memory location
+    ;; possible an error in documentation since every tested CPU disagrees with
+    ;; that. Use emms anyway since the vast majority of machines will use the
+    ;; SSE2 variant
+    emms
+%endif
+    RET
 %endmacro

 INIT_XMM sse