[FFmpeg-cvslog] x86/dsputilenc: add missing guards to ff_pix_sum16_xop

James Almer git at videolan.org
Thu May 29 23:06:29 CEST 2014


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu May 29 17:05:57 2014 -0300| [02a3e327f118efc118d30fc390e59c5119c6920d] | committer: Michael Niedermayer

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 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=02a3e327f118efc118d30fc390e59c5119c6920d
---

 libavcodec/x86/dsputilenc.asm |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/dsputilenc.asm
index 2cb70f0..de36b95 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



More information about the ffmpeg-cvslog mailing list