summaryrefslogtreecommitdiff
path: root/media/libav/libavutil/cpu.c
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2022-09-14 09:42:09 +0000
committerMoonchild <moonchild@palemoon.org>2022-09-14 09:42:09 +0000
commit302d46a0f999f8ec99bc65a6dab1b0b18d733dd6 (patch)
tree53bd57c4d2349efaf4acf672f41254ea410e96d3 /media/libav/libavutil/cpu.c
parentf9a1ebf886b9c59704334a69e45b04a6ddee35aa (diff)
parentd2683b0ff708b7c06f8247d8401f876c6620e3f1 (diff)
downloaduxp-302d46a0f999f8ec99bc65a6dab1b0b18d733dd6.tar.gz
Merge pull request 'Media fixes to play nice with MSVC WPO/GL' (#2006) from twivi/UXP:optimize into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2006 Reviewed-by: Moonchild <moonchild@palemoon.org>
Diffstat (limited to 'media/libav/libavutil/cpu.c')
-rw-r--r--media/libav/libavutil/cpu.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/media/libav/libavutil/cpu.c b/media/libav/libavutil/cpu.c
index 354d21e76f..6d100e95c1 100644
--- a/media/libav/libavutil/cpu.c
+++ b/media/libav/libavutil/cpu.c
@@ -51,14 +51,15 @@ int av_get_cpu_flags(void)
if (checked)
return flags;
- if (ARCH_AARCH64)
+ #if ARCH_AARCH64 == 1
flags = ff_get_cpu_flags_aarch64();
- if (ARCH_ARM)
+ #elif ARCH_ARM == 1
flags = ff_get_cpu_flags_arm();
- if (ARCH_PPC)
+ #elif ARCH_PPC == 1
flags = ff_get_cpu_flags_ppc();
- if (ARCH_X86)
+ #elif ARCH_X86 == 1
flags = ff_get_cpu_flags_x86();
+ #endif
flags &= cpuflags_mask;
checked = 1;