[FFmpeg-cvslog] x86/synth_filter: compile avx and fma3 functions unconditionally

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Apr  4 22:53:18 2014 -0300| [7d2116dd09d19d9aa08f9155a932d684c8d6a2f7] | committer: Michael Niedermayer

x86/synth_filter: compile avx and fma3 functions unconditionally

Fixes compilation failures with "--disable-{avx,fma3} --disable-optimizations"

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=7d2116dd09d19d9aa08f9155a932d684c8d6a2f7
---

 libavcodec/x86/dcadsp.asm    |    4 ----
 libavcodec/x86/dcadsp_init.c |    6 ------
 2 files changed, 10 deletions(-)

diff --git a/libavcodec/x86/dcadsp.asm b/libavcodec/x86/dcadsp.asm
index 1a72597..e49d63d 100644
--- a/libavcodec/x86/dcadsp.asm
+++ b/libavcodec/x86/dcadsp.asm
@@ -416,11 +416,7 @@ SYNTH_FILTER
 %endif
 INIT_XMM sse2
 SYNTH_FILTER
-%if HAVE_AVX_EXTERNAL
 INIT_YMM avx
 SYNTH_FILTER
-%endif
-%if HAVE_FMA3_EXTERNAL
 INIT_YMM fma3
 SYNTH_FILTER
-%endif
diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c
index 5975fee..77f4398 100644
--- a/libavcodec/x86/dcadsp_init.c
+++ b/libavcodec/x86/dcadsp_init.c
@@ -82,13 +82,7 @@ SYNTH_FILTER_FUNC(sse)
 #endif
 SYNTH_FILTER_FUNC(sse2)
 SYNTH_FILTER_FUNC(avx)
-static void synth_filter_fma3(FFTContext *imdct,
-                             float *synth_buf_ptr, int *synth_buf_offset,
-                             float synth_buf2[32], const float window[512],
-                             float out[32], const float in[32], float scale);
-#if HAVE_FMA3_EXTERNAL
 SYNTH_FILTER_FUNC(fma3)
-#endif
 #endif /* HAVE_YASM */
 
 av_cold void ff_synth_filter_init_x86(SynthFilterContext *s)