diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:27:11 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:27:11 +0100 |
| commit | 2214207d048187b85cd3af3e54b064f87728aa07 (patch) | |
| tree | 5a55912dc1c4b980255e3a122bfc18f65d8503ed | |
| parent | 0eefc758e23ec46465179847c2a20dca531d7b37 (diff) | |
| parent | 8563f9887194b07c972c3475d6b51592d77f73f7 (diff) | |
| download | ffmpeg-2214207d048187b85cd3af3e54b064f87728aa07.tar.gz | |
Merge commit '8563f9887194b07c972c3475d6b51592d77f73f7'
* commit '8563f9887194b07c972c3475d6b51592d77f73f7':
x86: use emms after ff_int32_to_float_fmul_scalar_sse
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/x86/fmtconvert.asm | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index bc0006c554..b4220e21ea 100644 --- 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 |