diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-03-04 19:40:21 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-03-05 23:16:21 +0100 |
| commit | 3bfdee00cd92ff07c364d4901c4aefda32780756 (patch) | |
| tree | 8e0f845a1c252f4c41f6f8202060c968738bdeaa /libavcodec/x86 | |
| parent | e1f2987b10112489f6da5501d4c8735a798c9e3f (diff) | |
| download | ffmpeg-3bfdee00cd92ff07c364d4901c4aefda32780756.tar.gz | |
x86: dcadsp: Fix linking with yasm and optimizations disabled
Some optimized functions reference optimized symbols, so the functions
must be explicitly disabled when those symbols are unavailable.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dcadsp_init.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/x86/dcadsp_init.c b/libavcodec/x86/dcadsp_init.c index 3821892166..65e3db5c6c 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 /* HAVE_YASM */ 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 /* HAVE_YASM */ } |