[FFmpeg-cvslog] x86/synth_filter: add missing HAVE_YASM guard
James Almer
git at videolan.org
Tue Mar 4 23:14:24 CET 2014
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Mar 4 05:47:38 2014 -0300| [206167a295a5c28cec3c38f7308835b0b7e0618f] | committer: Michael Niedermayer
x86/synth_filter: add missing HAVE_YASM guard
Should fix compilation failures with --disable-yasm on some compilers
Signed-off-by: James Almer <jamrial at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=206167a295a5c28cec3c38f7308835b0b7e0618f
---
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
}
More information about the ffmpeg-cvslog
mailing list