diff options
| author | James Almer <jamrial@gmail.com> | 2014-04-04 22:53:18 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-05 05:15:27 +0200 |
| commit | 7d2116dd09d19d9aa08f9155a932d684c8d6a2f7 (patch) | |
| tree | 99c3e818a0f0e2e7ba2efc5ed24eed905cae3ad8 /libavcodec | |
| parent | ec8789ac635356bfddddebbdde86b4b0d7998712 (diff) | |
| download | ffmpeg-7d2116dd09d19d9aa08f9155a932d684c8d6a2f7.tar.gz | |
x86/synth_filter: compile avx and fma3 functions unconditionally
Fixes compilation failures with "--disable-{avx,fma3} --disable-optimizations"
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/x86/dcadsp.asm | 4 | ||||
| -rw-r--r-- | libavcodec/x86/dcadsp_init.c | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/libavcodec/x86/dcadsp.asm b/libavcodec/x86/dcadsp.asm index 1a725978a3..e49d63d8ad 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 5975feefa6..77f4398377 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) |