diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-28 14:53:33 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-31 01:53:25 +0200 |
| commit | 17337f54c057accf12b0e87d12f576194ad085a8 (patch) | |
| tree | 1b09c5750a307bbae18fbbcae93aa79b40bf602a /libavutil | |
| parent | 43b73d59a8b6cba60b0401b39f0f577bc6c1df9e (diff) | |
| download | ffmpeg-17337f54c057accf12b0e87d12f576194ad085a8.tar.gz | |
x86: Split inline and external assembly #ifdefs
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/internal.h | 6 | ||||
| -rw-r--r-- | libavutil/x86/float_dsp.asm | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libavutil/internal.h b/libavutil/internal.h index 12b71086e6..6862000722 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -158,7 +158,7 @@ # define ONLY_IF_THREADS_ENABLED(x) NULL #endif -#if HAVE_MMX && HAVE_INLINE_ASM +#if HAVE_MMX_INLINE /** * Empty mmx state. * this must be called between any dsp function and float/double code. @@ -171,8 +171,8 @@ static av_always_inline void emms_c(void) #elif HAVE_MMX && HAVE_MM_EMPTY # include <mmintrin.h> # define emms_c _mm_empty -#else /* HAVE_MMX */ +#else # define emms_c() -#endif /* HAVE_MMX */ +#endif /* HAVE_MMX_INLINE */ #endif /* AVUTIL_INTERNAL_H */ diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm index 8c0ebc133c..934dac08d9 100644 --- a/libavutil/x86/float_dsp.asm +++ b/libavutil/x86/float_dsp.asm @@ -45,7 +45,7 @@ ALIGN 16 INIT_XMM sse VECTOR_FMUL -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_YMM avx VECTOR_FMUL %endif @@ -86,7 +86,7 @@ cglobal vector_fmac_scalar, 4,4,3, dst, src, mul, len INIT_XMM sse VECTOR_FMAC_SCALAR -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_YMM avx VECTOR_FMAC_SCALAR %endif |