# HG changeset patch # User diego # Date 1181810681 0 # Node ID 9d4ca30481e0ec3c552a4c1752bb6256160972fb # Parent f3d9859953c1bf59be9526a926b2226c3e91183d Simplify init preprocessor statements. patch by Albert Lee, trisk+xine acm.jhu edu diff -r f3d9859953c1 -r 9d4ca30481e0 dsputil.c --- a/dsputil.c Thu Jun 14 07:28:16 2007 +0000 +++ b/dsputil.c Thu Jun 14 08:44:41 2007 +0000 @@ -4138,31 +4138,23 @@ memset(c->put_2tap_qpel_pixels_tab, 0, sizeof(c->put_2tap_qpel_pixels_tab)); memset(c->avg_2tap_qpel_pixels_tab, 0, sizeof(c->avg_2tap_qpel_pixels_tab)); -#ifdef HAVE_MMX +#if defined(HAVE_MMX) dsputil_init_mmx(c, avctx); -#endif -#ifdef ARCH_ARMV4L +#elif defined(ARCH_ARMV4L) dsputil_init_armv4l(c, avctx); -#endif -#ifdef HAVE_MLIB +#elif defined(HAVE_MLIB) dsputil_init_mlib(c, avctx); -#endif -#ifdef ARCH_SPARC +#elif defined(ARCH_SPARC) dsputil_init_vis(c,avctx); -#endif -#ifdef ARCH_ALPHA +#elif defined(ARCH_ALPHA) dsputil_init_alpha(c, avctx); -#endif -#ifdef ARCH_POWERPC +#elif defined(ARCH_POWERPC) dsputil_init_ppc(c, avctx); -#endif -#ifdef HAVE_MMI +#elif defined(HAVE_MMI) dsputil_init_mmi(c, avctx); -#endif -#ifdef ARCH_SH4 +#elif defined(ARCH_SH4) dsputil_init_sh4(c,avctx); -#endif -#ifdef ARCH_BFIN +#elif defined(ARCH_BFIN) dsputil_init_bfin(c,avctx); #endif diff -r f3d9859953c1 -r 9d4ca30481e0 mpegvideo.c --- a/mpegvideo.c Thu Jun 14 07:28:16 2007 +0000 +++ b/mpegvideo.c Thu Jun 14 08:44:41 2007 +0000 @@ -277,25 +277,19 @@ s->denoise_dct= denoise_dct_c; #endif //CONFIG_ENCODERS -#ifdef HAVE_MMX +#if defined(HAVE_MMX) MPV_common_init_mmx(s); -#endif -#ifdef ARCH_ALPHA +#elif defined(ARCH_ALPHA) MPV_common_init_axp(s); -#endif -#ifdef HAVE_MLIB +#elif defined(HAVE_MLIB) MPV_common_init_mlib(s); -#endif -#ifdef HAVE_MMI +#elif defined(HAVE_MMI) MPV_common_init_mmi(s); -#endif -#ifdef ARCH_ARMV4L +#elif defined(ARCH_ARMV4L) MPV_common_init_armv4l(s); -#endif -#ifdef ARCH_POWERPC +#elif defined(ARCH_POWERPC) MPV_common_init_ppc(s); -#endif -#ifdef ARCH_BFIN +#elif defined(ARCH_BFIN) MPV_common_init_bfin(s); #endif