[FFmpeg-cvslog] x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.

Justin Ruggles git at videolan.org
Wed May 23 22:00:57 CEST 2012


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Mon May 21 21:21:36 2012 -0400| [713548cbad4735d691ea286f23adfb67900e6700] | committer: Diego Biurrun

x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.

This is needed for older versions of yasm/nasm that do not support AVX.

Signed-off-by: Diego Biurrun <diego at biurrun.de>

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

 libavcodec/x86/dsputil_yasm.asm |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/x86/dsputil_yasm.asm b/libavcodec/x86/dsputil_yasm.asm
index 708ee67..c6ef834 100644
--- a/libavcodec/x86/dsputil_yasm.asm
+++ b/libavcodec/x86/dsputil_yasm.asm
@@ -1156,8 +1156,10 @@ ALIGN 16
 
 INIT_XMM sse
 VECTOR_FMUL
+%if HAVE_AVX
 INIT_YMM avx
 VECTOR_FMUL
+%endif
 
 ;-----------------------------------------------------------------------------
 ; void vector_fmul_reverse(float *dst, const float *src0, const float *src1,
@@ -1198,8 +1200,10 @@ ALIGN 16
 
 INIT_XMM sse
 VECTOR_FMUL_REVERSE
+%if HAVE_AVX
 INIT_YMM avx
 VECTOR_FMUL_REVERSE
+%endif
 
 ;-----------------------------------------------------------------------------
 ; vector_fmul_add(float *dst, const float *src0, const float *src1,
@@ -1231,8 +1235,10 @@ ALIGN 16
 
 INIT_XMM sse
 VECTOR_FMUL_ADD
+%if HAVE_AVX
 INIT_YMM avx
 VECTOR_FMUL_ADD
+%endif
 
 ;-----------------------------------------------------------------------------
 ; void ff_butterflies_float_interleave(float *dst, const float *src0,
@@ -1279,8 +1285,10 @@ cglobal butterflies_float_interleave, 4,4,3, dst, src0, src1, len
 
 INIT_XMM sse
 BUTTERFLIES_FLOAT_INTERLEAVE
+%if HAVE_AVX
 INIT_YMM avx
 BUTTERFLIES_FLOAT_INTERLEAVE
+%endif
 
 INIT_XMM sse2
 ; %1 = aligned/unaligned



More information about the ffmpeg-cvslog mailing list