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 /libavfilter/x86/yadif.c | |
parent | 43b73d59a8b6cba60b0401b39f0f577bc6c1df9e (diff) |
x86: Split inline and external assembly #ifdefs
Diffstat (limited to 'libavfilter/x86/yadif.c')
-rw-r--r-- | libavfilter/x86/yadif.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index cdf13d3e56..f178b32cbe 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -31,7 +31,7 @@ DECLARE_ASM_CONST(16, const xmm_reg, pb_1) = {0x0101010101010101ULL, 0x0101010101010101ULL}; DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x0001000100010001ULL}; -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE #define COMPILE_TEMPLATE_SSE2 1 #define COMPILE_TEMPLATE_SSSE3 1 #undef RENAME @@ -40,14 +40,14 @@ DECLARE_ASM_CONST(16, const xmm_reg, pw_1) = {0x0001000100010001ULL, 0x000100010 #undef COMPILE_TEMPLATE_SSSE3 #endif -#if HAVE_SSE +#if HAVE_SSE2_INLINE #undef RENAME #define RENAME(a) a ## _sse2 #include "yadif_template.c" #undef COMPILE_TEMPLATE_SSE2 #endif -#if HAVE_MMXEXT +#if HAVE_MMXEXT_INLINE #undef RENAME #define RENAME(a) a ## _mmx2 #include "yadif_template.c" @@ -59,18 +59,16 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) { int cpu_flags = av_get_cpu_flags(); -#if HAVE_INLINE_ASM -#if HAVE_MMXEXT +#if HAVE_MMXEXT_INLINE if (cpu_flags & AV_CPU_FLAG_MMXEXT) yadif->filter_line = yadif_filter_line_mmx2; #endif -#if HAVE_SSE +#if HAVE_SSE2_INLINE if (cpu_flags & AV_CPU_FLAG_SSE2) yadif->filter_line = yadif_filter_line_sse2; #endif -#if HAVE_SSSE3 +#if HAVE_SSSE3_INLINE if (cpu_flags & AV_CPU_FLAG_SSSE3) yadif->filter_line = yadif_filter_line_ssse3; #endif -#endif /* HAVE_INLINE_ASM */ } |