From bb55d88f075ae4a9629303e7b8d94d6f541f9723 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Thu, 20 May 2004 09:07:56 +0000 Subject: [PATCH] Dimitar Zhekov: fixed mplayer no-altivec2.patch for cpudetect=0 (cut down) [2004051009182926843] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3012 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/jimmy/mplayer/no-altivec2.patch | 38 +++++++------------------ 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/package/jimmy/mplayer/no-altivec2.patch b/package/jimmy/mplayer/no-altivec2.patch index bbc126c41..001a23109 100644 --- a/package/jimmy/mplayer/no-altivec2.patch +++ b/package/jimmy/mplayer/no-altivec2.patch @@ -5,40 +5,22 @@ Additionally cleaned up the else case a bit. - Rene Rebe ---- MPlayer-1.0pre4/postproc/swscale.c 2004-04-26 21:38:17.000000000 +0200 -+++ MPlayer-1.0pre4-fixed/postproc/swscale.c 2004-04-28 15:02:29.000000000 +0200 -@@ -1339,19 +1339,16 @@ - return swScale_3DNow; - else if(flags & SWS_CPU_CAPS_MMX) - return swScale_MMX; -- else -- return swScale_C; +RUN_CPUDETECT='0' failed, cut down to the bare minimum. + + - Dimitar Zhekov + +--- ./postproc/swscale.c.orig 2004-04-26 22:38:17.000000000 +0300 ++++ ./postproc/swscale.c 2004-05-08 12:53:21.000000000 +0300 +@@ -1344,10 +1344,11 @@ #else #ifdef ARCH_POWERPC +#ifdef HAVE_ALTIVEC if(flags & SWS_CPU_CAPS_ALTIVEC) return swScale_altivec; -- else + else - return swScale_C; - #endif -- return swScale_C; - #endif --#else //RUNTIME_CPUDETECT +#endif -+#else //!RUNTIME_CPUDETECT - #ifdef HAVE_MMX2 - return swScale_MMX2; - #elif defined (HAVE_3DNOW) -@@ -1360,10 +1357,9 @@ - return swScale_MMX; - #elif defined (HAVE_ALTIVEC) - return swScale_altivec; --#else -- return swScale_C; #endif - #endif //!RUNTIME_CPUDETECT -+ return swScale_C; - } - - static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, + return swScale_C; + #endif