---
libavcodec/x86/dsputil_yasm.asm | 2 --
libavcodec/x86/fmtconvert.asm | 3 ---
libavutil/x86/x86util.asm | 16 +++++++---------
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/libavcodec/x86/dsputil_yasm.asm b/libavcodec/x86/dsputil_yasm.asm
index 5258f84..07f83dd 100644
--- a/libavcodec/x86/dsputil_yasm.asm
+++ b/libavcodec/x86/dsputil_yasm.asm
@@ -1124,10 +1124,8 @@ cglobal vector_clip_int32%5, 5,5,%1, dst, src, min, max,
len
%endmacro
INIT_MMX mmx
-%define SPLATD SPLATD_MMX
VECTOR_CLIP_INT32 0, 1, 0, 0
INIT_XMM sse2
-%define SPLATD SPLATD_SSE2
VECTOR_CLIP_INT32 6, 1, 0, 0, _int
VECTOR_CLIP_INT32 6, 2, 0, 1
INIT_XMM sse4
diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm
index 1751200..68616f2 100644
--- a/libavcodec/x86/fmtconvert.asm
+++ b/libavcodec/x86/fmtconvert.asm
@@ -72,14 +72,11 @@ cglobal int32_to_float_fmul_scalar, 4, 4, %1, dst, src,
mul, len
%endmacro
INIT_XMM sse
-%define SPLATD SPLATD_SSE
%define movdqa movaps
INT32_TO_FLOAT_FMUL_SCALAR 5
INIT_XMM sse2
%undef movdqa
-%define SPLATD SPLATD_SSE2
INT32_TO_FLOAT_FMUL_SCALAR 3
-%undef SPLATD
;------------------------------------------------------------------------------
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm
index 52e5e58..6911a9c 100644
--- a/libavutil/x86/x86util.asm
+++ b/libavutil/x86/x86util.asm
@@ -558,16 +558,14 @@
%endif
%endmacro
-%macro SPLATD_MMX 1
- punpckldq %1, %1
-%endmacro
-
-%macro SPLATD_SSE 1
- shufps %1, %1, 0
-%endmacro
-
-%macro SPLATD_SSE2 1
+%macro SPLATD 1
+%if cpuflag(sse2)
pshufd %1, %1, 0
+%elif cpuflag(sse)
+ shufps %1, %1, 0
+%else
+ punpckldq %1, %1
+%endif
%endmacro
%macro CLIPW 3 ;(dst, min, max)
--
1.7.2.5
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel