From 155b971f55bae045350a0ee9a4068d3aacd2119b Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Thu, 14 Jun 2007 16:36:22 +0200 Subject: Init mpegvideo only once (fixes when MMX and mediaLib are both present). Applied to FFmpeg tree already. --- src/libffmpeg/libavcodec/mpegvideo.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c index 87c913efa..76c300600 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.c +++ b/src/libffmpeg/libavcodec/mpegvideo.c @@ -287,22 +287,17 @@ 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 -- cgit v1.2.3