From 713548cbad4735d691ea286f23adfb67900e6700 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Mon, 21 May 2012 21:21:36 -0400 Subject: [PATCH] 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 --- 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 708ee67678..c6ef834503 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