summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-21 12:07:16 -0300
committerJames Almer <jamrial@gmail.com>2017-10-21 12:15:57 -0300
commit2904db90458a1253e4aea6844ba9a59ac11923b6 (patch)
treeb8410cd30199ff45585fce360fe6ec75a5fdcca3 /libswscale
parentede5ddb58683b1186271bf2144843adaff3390c9 (diff)
parent994c4bc10751e39c7ed9f67ffd0c0dea5223daf2 (diff)
Merge commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2'
* commit '994c4bc10751e39c7ed9f67ffd0c0dea5223daf2': x86util: Port all macros to cpuflags See d5f8a642f6eb1c6e305c41dabddd0fd36ffb3f77 Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/x86/scale.asm10
1 files changed, 1 insertions, 9 deletions
diff --git a/libswscale/x86/scale.asm b/libswscale/x86/scale.asm
index f9781703a9..83cabff722 100644
--- a/libswscale/x86/scale.asm
+++ b/libswscale/x86/scale.asm
@@ -364,15 +364,7 @@ cglobal hscale%1to%2_%4, %5, 10, %6, pos0, dst, w, srcmem, filter, fltpos, fltsi
movd [dstq+wq*2], m0
%endif ; %3 ==/!= X
%else ; %2 == 19
-%if mmsize == 8
- PMINSD_MMX m0, m2, m4
-%elif cpuflag(sse4)
- pminsd m0, m2
-%else ; sse2/ssse3
- cvtdq2ps m0, m0
- minps m0, m2
- cvtps2dq m0, m0
-%endif ; mmx/sse2/ssse3/sse4
+ PMINSD m0, m2, m4
%ifnidn %3, X
mova [dstq+wq*(4>>wshr)], m0
%else ; %3 == X