From a15b9cf7dfab926c0510aa554688318d3103982e Mon Sep 17 00:00:00 2001
From: Juergen Keil <jkeil@users.sourceforge.net>
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/mpegvideo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libffmpeg/libavcodec/mpegvideo.c')

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