[FFmpeg-cvslog] mpegvideo: Replace arch initialization ifdeffery by standard conditionals

Diego Biurrun git at videolan.org
Thu Aug 29 15:00:13 CEST 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Tue Aug 20 18:25:04 2013 +0200| [70dd8892bf00923af838756dfbb356a9b1e4e40d] | committer: Diego Biurrun

mpegvideo: Replace arch initialization ifdeffery by standard conditionals

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=70dd8892bf00923af838756dfbb356a9b1e4e40d
---

 libavcodec/mpegvideo.c |   21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index f0c0ada..5b71d1b 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -165,17 +165,16 @@ av_cold int ff_dct_common_init(MpegEncContext *s)
         s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact;
     s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
 
-#if ARCH_X86
-    ff_MPV_common_init_x86(s);
-#elif ARCH_ALPHA
-    ff_MPV_common_init_axp(s);
-#elif ARCH_ARM
-    ff_MPV_common_init_arm(s);
-#elif ARCH_BFIN
-    ff_MPV_common_init_bfin(s);
-#elif ARCH_PPC
-    ff_MPV_common_init_ppc(s);
-#endif
+    if (ARCH_ALPHA)
+        ff_MPV_common_init_axp(s);
+    if (ARCH_ARM)
+        ff_MPV_common_init_arm(s);
+    if (ARCH_BFIN)
+        ff_MPV_common_init_bfin(s);
+    if (ARCH_PPC)
+        ff_MPV_common_init_ppc(s);
+    if (ARCH_X86)
+        ff_MPV_common_init_x86(s);
 
     /* load & permutate scantables
      * note: only wmv uses different ones



More information about the ffmpeg-cvslog mailing list