diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2012-05-21 21:21:36 -0400 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-05-22 20:46:02 +0200 |
| commit | 713548cbad4735d691ea286f23adfb67900e6700 (patch) | |
| tree | 85d024ff52c01346c0c7ba02092f3fcd7c919085 | |
| parent | cc7fac9970c61f764cc9ca2a263c11fb1497dd28 (diff) | |
| download | ffmpeg-713548cbad4735d691ea286f23adfb67900e6700.tar.gz | |
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@biurrun.de>
| -rw-r--r-- | libavcodec/x86/dsputil_yasm.asm | 8 |
1 files changed, 8 insertions, 0 deletions
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 |