Commit 8fcc5d96 authored by Andreas Rheinhardt's avatar Andreas Rheinhardt Committed by Ruiling Song

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: 's avatarAndreas Rheinhardt <andreas.rheinhardt@gmail.com>
parent 52939a2c
......@@ -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++)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment