diff options
| author | Albert Lee <trisk+xine@acm.jhu.edu> | 2007-06-14 08:44:41 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-06-14 08:44:41 +0000 |
| commit | ad0f6c1fcd37e2d3925609152a0095b46c9bab2c (patch) | |
| tree | 0ba4b89ecc1f919ff6705167c1ea6cf39ea4b174 | |
| parent | 4931546e26bb90da40643ac7578f30eb068d91ff (diff) | |
Simplify init preprocessor statements.
patch by Albert Lee, trisk+xine acm.jhu edu
Originally committed as revision 9307 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/dsputil.c | 26 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.c | 20 |
2 files changed, 16 insertions, 30 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 6e9badc25b..6fd599fd0c 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -4138,31 +4138,23 @@ void dsputil_init(DSPContext* c, AVCodecContext *avctx) 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 --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 8e4e4a2090..b8b2bb4d5c 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -277,25 +277,19 @@ int DCT_common_init(MpegEncContext *s) 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 |