4 files changed, 30 insertions, 21 deletions
diff --git a/media/ffvpx/libavcodec/h264pred.c b/media/ffvpx/libavcodec/h264pred.c
index 5632a58fd7..f9f3af50e2 100644
--- a/media/ffvpx/libavcodec/h264pred.c
+++ b/media/ffvpx/libavcodec/h264pred.c
@@ -592,12 +592,13 @@ av_cold void ff_h264_pred_init(H264PredContext *h, int codec_id,
             break;
     }
 
-    if (ARCH_AARCH64)
+    #if ARCH_AARCH64 == 1
         ff_h264_pred_init_aarch64(h, codec_id, bit_depth, chroma_format_idc);
-    if (ARCH_ARM)
+    #elif ARCH_ARM == 1
         ff_h264_pred_init_arm(h, codec_id, bit_depth, chroma_format_idc);
-    if (ARCH_X86)
+    #elif ARCH_X86 == 1
         ff_h264_pred_init_x86(h, codec_id, bit_depth, chroma_format_idc);
-    if (ARCH_MIPS)
+    #elif ARCH_MIPS == 1
         ff_h264_pred_init_mips(h, codec_id, bit_depth, chroma_format_idc);
+	#endif
 }
diff --git a/media/ffvpx/libavcodec/videodsp.c b/media/ffvpx/libavcodec/videodsp.c
index ce9e9eb143..4f082a4267 100644
--- a/media/ffvpx/libavcodec/videodsp.c
+++ b/media/ffvpx/libavcodec/videodsp.c
@@ -44,14 +44,15 @@ av_cold void ff_videodsp_init(VideoDSPContext *ctx, int bpc)
         ctx->emulated_edge_mc = ff_emulated_edge_mc_16;
     }
 
-    if (ARCH_AARCH64)
+    #if ARCH_AARCH64 == 1
         ff_videodsp_init_aarch64(ctx, bpc);
-    if (ARCH_ARM)
+    #elif ARCH_ARM == 1
         ff_videodsp_init_arm(ctx, bpc);
-    if (ARCH_PPC)
+    #elif ARCH_PPC == 1
         ff_videodsp_init_ppc(ctx, bpc);
-    if (ARCH_X86)
+    #elif ARCH_X86 == 1
         ff_videodsp_init_x86(ctx, bpc);
-    if (ARCH_MIPS)
+    #elif ARCH_MIPS == 1
         ff_videodsp_init_mips(ctx, bpc);
+    #endif
 }
diff --git a/media/ffvpx/libavcodec/vp8dsp.c b/media/ffvpx/libavcodec/vp8dsp.c
index 4ff63d0784..efaf3e71a7 100644
--- a/media/ffvpx/libavcodec/vp8dsp.c
+++ b/media/ffvpx/libavcodec/vp8dsp.c
@@ -673,14 +673,15 @@ av_cold void ff_vp78dsp_init(VP8DSPContext *dsp)
     VP78_BILINEAR_MC_FUNC(1, 8);
     VP78_BILINEAR_MC_FUNC(2, 4);
 
-    if (ARCH_AARCH64)
+    #if ARCH_AARCH64 == 1
         ff_vp78dsp_init_aarch64(dsp);
-    if (ARCH_ARM)
+    #elif ARCH_ARM == 1
         ff_vp78dsp_init_arm(dsp);
-    if (ARCH_PPC)
+    #elif ARCH_PPC == 1
         ff_vp78dsp_init_ppc(dsp);
-    if (ARCH_X86)
+    #elif ARCH_X86 == 1
         ff_vp78dsp_init_x86(dsp);
+    #endif
 }
 
 #if CONFIG_VP7_DECODER
@@ -735,13 +736,14 @@ av_cold void ff_vp8dsp_init(VP8DSPContext *dsp)
     dsp->vp8_v_loop_filter_simple = vp8_v_loop_filter_simple_c;
     dsp->vp8_h_loop_filter_simple = vp8_h_loop_filter_simple_c;
 
-    if (ARCH_AARCH64)
+    #if ARCH_AARCH64 == 1
         ff_vp8dsp_init_aarch64(dsp);
-    if (ARCH_ARM)
+    #elif ARCH_ARM == 1
         ff_vp8dsp_init_arm(dsp);
-    if (ARCH_X86)
+    #elif ARCH_X86 == 1
         ff_vp8dsp_init_x86(dsp);
-    if (ARCH_MIPS)
+    #elif ARCH_MIPS == 1
         ff_vp8dsp_init_mips(dsp);
+    #endif
 }
 #endif /* CONFIG_VP8_DECODER */
diff --git a/media/ffvpx/libavcodec/vp9dsp.c b/media/ffvpx/libavcodec/vp9dsp.c
index f6d73f73cd..b8fa3be36d 100644
--- a/media/ffvpx/libavcodec/vp9dsp.c
+++ b/media/ffvpx/libavcodec/vp9dsp.c
@@ -92,8 +92,13 @@ av_cold void ff_vp9dsp_init(VP9DSPContext *dsp, int bpp, int bitexact)
         ff_vp9dsp_init_12(dsp);
     }
 
-    if (ARCH_AARCH64) ff_vp9dsp_init_aarch64(dsp, bpp);
-    if (ARCH_ARM) ff_vp9dsp_init_arm(dsp, bpp);
-    if (ARCH_X86) ff_vp9dsp_init_x86(dsp, bpp, bitexact);
-    if (ARCH_MIPS) ff_vp9dsp_init_mips(dsp, bpp);
+    #if ARCH_AARCH64 == 1
+        ff_vp9dsp_init_aarch64(dsp, bpp);
+    #elif ARCH_ARM == 1
+        ff_vp9dsp_init_arm(dsp, bpp);
+    #elif ARCH_X86 == 1
+        ff_vp9dsp_init_x86(dsp, bpp, bitexact);
+    #elif ARCH_MIPS == 1
+        ff_vp9dsp_init_mips(dsp, bpp);
+    #endif
 }