From a15b9cf7dfab926c0510aa554688318d3103982e Mon Sep 17 00:00:00 2001 From: Juergen Keil Date: Tue, 22 Oct 2002 17:09:26 +0000 Subject: MMX and mediaLib does not work well on Solaris x86, when both accelertions are available. Use MMX only in that case. CVS patchset: 2937 CVS date: 2002/10/22 17:09:26 --- src/libffmpeg/libavcodec/dsputil.c | 8 ++++---- src/libffmpeg/libavcodec/mpegvideo.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/libffmpeg/libavcodec/dsputil.c b/src/libffmpeg/libavcodec/dsputil.c index f63b61db3..f98ad388a 100644 --- a/src/libffmpeg/libavcodec/dsputil.c +++ b/src/libffmpeg/libavcodec/dsputil.c @@ -1641,10 +1641,6 @@ void dsputil_init(void) #ifdef ARCH_ARMV4L dsputil_init_armv4l(); #endif -#ifdef HAVE_MLIB - dsputil_init_mlib(); - use_permuted_idct = 0; -#endif #ifdef ARCH_ALPHA dsputil_init_alpha(); use_permuted_idct = 0; @@ -1652,6 +1648,10 @@ void dsputil_init(void) #ifdef ARCH_POWERPC dsputil_init_ppc(); #endif +#if defined(HAVE_MLIB) && !defined(HAVE_MMX) + dsputil_init_mlib(); + use_permuted_idct = 0; +#endif #ifdef SIMPLE_IDCT if (ff_idct == NULL) { diff --git a/src/libffmpeg/libavcodec/mpegvideo.c b/src/libffmpeg/libavcodec/mpegvideo.c index b4415227f..53534736a 100644 --- a/src/libffmpeg/libavcodec/mpegvideo.c +++ b/src/libffmpeg/libavcodec/mpegvideo.c @@ -152,7 +152,7 @@ int MPV_common_init(MpegEncContext *s) #ifdef ARCH_ALPHA MPV_common_init_axp(s); #endif -#ifdef HAVE_MLIB +#if defined(HAVE_MLIB) && !defined(HAVE_MMX) MPV_common_init_mlib(s); #endif -- cgit v1.2.3