Should fix compilation failures with --disable-yasm on some compilers
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 206167a295a5c28cec3c38f7308835b0b7e0618f)
Conflicts:
libavcodec/x86/dcadsp_init.c
... | ... |
@@ -60,6 +60,7 @@ void ff_synth_filter_inner_sse2(float *synth_buf_ptr, float synth_buf2[32], |
60 | 60 |
const float window[512], |
61 | 61 |
float out[32], intptr_t offset, float scale); |
62 | 62 |
|
63 |
+#if HAVE_YASM |
|
63 | 64 |
static void synth_filter_sse2(FFTContext *imdct, |
64 | 65 |
float *synth_buf_ptr, int *synth_buf_offset, |
65 | 66 |
float synth_buf2[32], const float window[512], |
... | ... |
@@ -74,12 +75,15 @@ static void synth_filter_sse2(FFTContext *imdct, |
74 | 74 |
|
75 | 75 |
*synth_buf_offset = (*synth_buf_offset - 32) & 511; |
76 | 76 |
} |
77 |
+#endif |
|
77 | 78 |
|
78 | 79 |
av_cold void ff_synth_filter_init_x86(SynthFilterContext *s) |
79 | 80 |
{ |
81 |
+#if HAVE_YASM |
|
80 | 82 |
int cpu_flags = av_get_cpu_flags(); |
81 | 83 |
|
82 | 84 |
if (EXTERNAL_SSE2(cpu_flags)) { |
83 | 85 |
s->synth_filter_float = synth_filter_sse2; |
84 | 86 |
} |
87 |
+#endif |
|
85 | 88 |
} |