diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-12 05:51:12 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-06-15 04:56:37 +0200 |
| commit | 40e6575aa3eed64cd32bf28c00ae57edc5acb25a (patch) | |
| tree | 3bc6e3ebca1972cf51f04e30f227e46ff204ec05 /libavfilter/vf_tinterlace.c | |
| parent | e5f6707a7b91664491041526ef3cce7412258b89 (diff) | |
| download | ffmpeg-40e6575aa3eed64cd32bf28c00ae57edc5acb25a.tar.gz | |
all: Replace if (ARCH_FOO) checks by #if ARCH_FOO
This is more spec-compliant because it does not rely
on dead-code elimination by the compiler. Especially
MSVC has problems with this, as can be seen in
https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/296373.html
or
https://ffmpeg.org/pipermail/ffmpeg-devel/2022-May/297022.html
This commit does not eliminate every instance where we rely
on dead code elimination: It only tackles branching to
the initialization of arch-specific dsp code, not e.g. all
uses of CONFIG_ and HAVE_ checks. But maybe it is already
enough to compile FFmpeg with MSVC with whole-programm-optimizations
enabled (if one does not disable too many components).
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavfilter/vf_tinterlace.c')
| -rw-r--r-- | libavfilter/vf_tinterlace.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libavfilter/vf_tinterlace.c b/libavfilter/vf_tinterlace.c index cda55a8c73..399adc102d 100644 --- a/libavfilter/vf_tinterlace.c +++ b/libavfilter/vf_tinterlace.c @@ -269,15 +269,17 @@ static int config_out_props(AVFilterLink *outlink) tinterlace->lowpass_line = lowpass_line_complex_c_16; else tinterlace->lowpass_line = lowpass_line_complex_c; - if (ARCH_X86) - ff_tinterlace_init_x86(tinterlace); +#if ARCH_X86 + ff_tinterlace_init_x86(tinterlace); +#endif } else if (tinterlace->flags & TINTERLACE_FLAG_VLPF) { if (tinterlace->csp->comp[0].depth > 8) tinterlace->lowpass_line = lowpass_line_c_16; else tinterlace->lowpass_line = lowpass_line_c; - if (ARCH_X86) - ff_tinterlace_init_x86(tinterlace); +#if ARCH_X86 + ff_tinterlace_init_x86(tinterlace); +#endif } av_log(ctx, AV_LOG_VERBOSE, "mode:%d filter:%s h:%d -> h:%d\n", tinterlace->mode, |