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 /libavcodec/h264dsp.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 'libavcodec/h264dsp.c')
| -rw-r--r-- | libavcodec/h264dsp.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index f97ac2823c..4d2ee10bab 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -152,10 +152,17 @@ av_cold void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, } c->startcode_find_candidate = ff_startcode_find_candidate_c; - if (ARCH_AARCH64) ff_h264dsp_init_aarch64(c, bit_depth, chroma_format_idc); - if (ARCH_ARM) ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc); - if (ARCH_PPC) ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc); - if (ARCH_X86) ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc); - if (ARCH_MIPS) ff_h264dsp_init_mips(c, bit_depth, chroma_format_idc); - if (ARCH_LOONGARCH) ff_h264dsp_init_loongarch(c, bit_depth, chroma_format_idc); +#if ARCH_AARCH64 + ff_h264dsp_init_aarch64(c, bit_depth, chroma_format_idc); +#elif ARCH_ARM + ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc); +#elif ARCH_PPC + ff_h264dsp_init_ppc(c, bit_depth, chroma_format_idc); +#elif ARCH_X86 + ff_h264dsp_init_x86(c, bit_depth, chroma_format_idc); +#elif ARCH_MIPS + ff_h264dsp_init_mips(c, bit_depth, chroma_format_idc); +#elif ARCH_LOONGARCH + ff_h264dsp_init_loongarch(c, bit_depth, chroma_format_idc); +#endif } |