diff options
| author | Mans Rullgard <mans@mansr.com> | 2012-07-02 23:04:04 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2012-07-03 14:14:13 +0100 |
| commit | fb93e61e2b7baa44ff991bc0ce96291490a0188e (patch) | |
| tree | 824501383c35578596bc2ecd1c4f4bfb1a6de6b7 /libavfilter/x86 | |
| parent | cbd9b2f918af681d206d10340f87fc6aced5cf3e (diff) | |
| download | ffmpeg-fb93e61e2b7baa44ff991bc0ce96291490a0188e.tar.gz | |
x86: lavfi: fix gradfun/yadif build with mmx/sse disabled
These functions are defined conditionally so any uses need to have
preprocessor guards.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'libavfilter/x86')
| -rw-r--r-- | libavfilter/x86/gradfun.c | 12 | ||||
| -rw-r--r-- | libavfilter/x86/yadif.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/libavfilter/x86/gradfun.c b/libavfilter/x86/gradfun.c index 1d6a7ab363..07569de146 100644 --- a/libavfilter/x86/gradfun.c +++ b/libavfilter/x86/gradfun.c @@ -168,10 +168,16 @@ av_cold void ff_gradfun_init_x86(GradFunContext *gf) { int cpu_flags = av_get_cpu_flags(); - if (HAVE_MMX2 && cpu_flags & AV_CPU_FLAG_MMX2) +#if HAVE_MMX2 + if (cpu_flags & AV_CPU_FLAG_MMX2) gf->filter_line = gradfun_filter_line_mmx2; - if (HAVE_SSSE3 && cpu_flags & AV_CPU_FLAG_SSSE3) +#endif +#if HAVE_SSSE3 + if (cpu_flags & AV_CPU_FLAG_SSSE3) gf->filter_line = gradfun_filter_line_ssse3; - if (HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2) +#endif +#if HAVE_SSE + if (cpu_flags & AV_CPU_FLAG_SSE2) gf->blur_line = gradfun_blur_line_sse2; +#endif } diff --git a/libavfilter/x86/yadif.c b/libavfilter/x86/yadif.c index fe77f3a99c..6d9f9b2880 100644 --- a/libavfilter/x86/yadif.c +++ b/libavfilter/x86/yadif.c @@ -53,10 +53,16 @@ av_cold void ff_yadif_init_x86(YADIFContext *yadif) { int cpu_flags = av_get_cpu_flags(); - if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) +#if HAVE_MMX + if (cpu_flags & AV_CPU_FLAG_MMX) yadif->filter_line = yadif_filter_line_mmx; - if (HAVE_SSE && cpu_flags & AV_CPU_FLAG_SSE2) +#endif +#if HAVE_SSE + if (cpu_flags & AV_CPU_FLAG_SSE2) yadif->filter_line = yadif_filter_line_sse2; - if (HAVE_SSSE3 && cpu_flags & AV_CPU_FLAG_SSSE3) +#endif +#if HAVE_SSSE3 + if (cpu_flags & AV_CPU_FLAG_SSSE3) yadif->filter_line = yadif_filter_line_ssse3; +#endif } |