From 8fcc5d963ebc5a9b8ee21fc79e5f3526f62a605d Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 12 Aug 2019 03:14:55 +0200 Subject: avfilter/vf_convolution: Fix build failures 98e419cb added SIMD for the convolution filter for x64 systems. As usual, it used a check of the form if (ARCH_X86_64) ff_convolution_init_x86(s); and thereby relied on the compiler eliminating this pseudo-runtime check at compiletime for non x64 systems (for which ff_convolution_init_x86 isn't defined) to compile. But vf_convolution.c contains more than one filter and if the convolution filter is disabled, but one of the other filters (prewitt, sobel, roberts) is enabled, the build will fail on x64, because ff_convolution_init_x86 isn't defined in this case. Signed-off-by: Andreas Rheinhardt --- libavfilter/vf_convolution.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index e3bf1df79f..f29df38a20 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -588,8 +588,9 @@ static int config_input(AVFilterLink *inlink) s->filter[p] = filter16_7x7; } } - if (ARCH_X86_64) - ff_convolution_init_x86(s); +#if CONFIG_CONVOLUTION_FILTER && ARCH_X86_64 + ff_convolution_init_x86(s); +#endif } else if (!strcmp(ctx->filter->name, "prewitt")) { if (s->depth > 8) for (p = 0; p < s->nb_planes; p++) -- cgit v1.2.3