aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2014-05-29 17:05:57 -0300
committerMichael Niedermayer <michaelni@gmx.at>2014-05-29 22:31:28 +0200
commit02a3e327f118efc118d30fc390e59c5119c6920d (patch)
treefd5b9e7da2bf2501d827b2133622cda6d4930bfb
parent99a319c4e7538670847ac4633ef8b0f0629deb22 (diff)
downloadffmpeg-02a3e327f118efc118d30fc390e59c5119c6920d.tar.gz
x86/dsputilenc: add missing guards to ff_pix_sum16_xop
XOP support was added in Yasm 1.0.0 and Nasm 2.06, and we still support older versions. Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/x86/dsputilenc.asm2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/dsputilenc.asm
index 2cb70f0a37..de36b95a30 100644
--- a/libavcodec/x86/dsputilenc.asm
+++ b/libavcodec/x86/dsputilenc.asm
@@ -500,8 +500,10 @@ INIT_MMX mmx
PIX_SUM16 0, 16, 3, 0
INIT_XMM sse2
PIX_SUM16 6, 8, 3, 2
+%if HAVE_XOP_EXTERNAL
INIT_XMM xop
PIX_SUM16 5, 4, 4, 4
+%endif
; int ff_pix_norm1_mmx(uint8_t *pix, int line_size)
; %1 = number of xmm registers used