[FFmpeg-devel] [PATCH] x86/synth_filter: add missing HAVE_YASM guard

James Almer jamrial at gmail.com
Tue Mar 4 09:47:38 CET 2014


Should fix compilation failures with --disable-yasm on some compilers

Signed-off-by: James Almer <jamrial at gmail.com>
---
http://fate.ffmpeg.org/report.cgi?time=20140304012616&slot=x86-opensolaris-gcc3.4
Couldn't reproduce a failure with --disable-yasm alone like in that example above 
using newer GCC on Linux or Windows, but was able to with --disable-yasm 
--disable-optimizations.
---
 libavcodec/x86/dcadsp_init.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c
index 2e5c153..832b335 100644
--- a/libavcodec/x86/dcadsp_init.c
+++ b/libavcodec/x86/dcadsp_init.c
@@ -76,14 +76,17 @@ static void synth_filter_##opt(FFTContext *imdct,                              \
     *synth_buf_offset = (*synth_buf_offset - 32) & 511;                        \
 }                                                                              \
 
+#if HAVE_YASM
 #if ARCH_X86_32
 SYNTH_FILTER_FUNC(sse)
 #endif
 SYNTH_FILTER_FUNC(sse2)
 SYNTH_FILTER_FUNC(avx)
+#endif
 
 av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
 {
+#if HAVE_YASM
     int cpu_flags = av_get_cpu_flags();
 
 #if ARCH_X86_32
@@ -97,4 +100,5 @@ av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
     if (EXTERNAL_AVX(cpu_flags)) {
         s->synth_filter_float = synth_filter_avx;
     }
+#endif
 }
-- 
1.8.3.2



More information about the ffmpeg-devel mailing list