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

James Almer git at videolan.org
Mon Oct 6 01:59:06 CEST 2014


ffmpeg | branch: release/2.2 | James Almer <jamrial at gmail.com> | Tue Mar  4 05:47:38 2014 -0300| [f253fa95529a52760f717e74b4ea0c81a7bbda04] | 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>
(cherry picked from commit 206167a295a5c28cec3c38f7308835b0b7e0618f)

Conflicts:

	libavcodec/x86/dcadsp_init.c

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f253fa95529a52760f717e74b4ea0c81a7bbda04
---

 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 9ededac..c661cab 100644
--- a/libavcodec/x86/dcadsp_init.c
+++ b/libavcodec/x86/dcadsp_init.c
@@ -60,6 +60,7 @@ void ff_synth_filter_inner_sse2(float *synth_buf_ptr, float synth_buf2[32],
                                 const float window[512],
                                 float out[32], intptr_t offset, float scale);
 
+#if HAVE_YASM
 static void synth_filter_sse2(FFTContext *imdct,
                               float *synth_buf_ptr, int *synth_buf_offset,
                               float synth_buf2[32], const float window[512],
@@ -74,12 +75,15 @@ static void synth_filter_sse2(FFTContext *imdct,
 
     *synth_buf_offset = (*synth_buf_offset - 32) & 511;
 }
+#endif
 
 av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)
 {
+#if HAVE_YASM
     int cpu_flags = av_get_cpu_flags();
 
     if (EXTERNAL_SSE2(cpu_flags)) {
         s->synth_filter_float = synth_filter_sse2;
     }
+#endif
 }



More information about the ffmpeg-cvslog mailing list