diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2009-04-08 20:21:21 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2009-04-08 20:21:21 +0000 |
| commit | 10a7d216722a2c402756725db35dfa4c27609a6b (patch) | |
| tree | a20430c1b40b2cd877542e916506225b99777d16 /libswscale | |
| parent | 9470511185393b6c921df679f532bc6bad98a078 (diff) | |
| download | ffmpeg-10a7d216722a2c402756725db35dfa4c27609a6b.tar.gz | |
Rename RUNTIME_CPUDETECT to CONFIG_RUNTIME_CPUDETECT and always define it.
Originally committed as revision 29154 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index 4799542421..ca5e2d986f 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -1096,12 +1096,12 @@ static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, //Note: we have C, MMX, MMX2, 3DNOW versions, there is no 3DNOW+MMX2 one //Plain C versions -#if !HAVE_MMX || defined (RUNTIME_CPUDETECT) || !CONFIG_GPL +#if !HAVE_MMX || CONFIG_RUNTIME_CPUDETECT || !CONFIG_GPL #define COMPILE_C #endif #if ARCH_PPC -#if (HAVE_ALTIVEC || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL +#if (HAVE_ALTIVEC || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL #undef COMPILE_C #define COMPILE_ALTIVEC #endif @@ -1109,15 +1109,15 @@ static void fillPlane(uint8_t* plane, int stride, int width, int height, int y, #if ARCH_X86 -#if ((HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL +#if ((HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL #define COMPILE_MMX #endif -#if (HAVE_MMX2 || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL +#if (HAVE_MMX2 || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL #define COMPILE_MMX2 #endif -#if ((HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT)) && CONFIG_GPL +#if ((HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT) && CONFIG_GPL #define COMPILE_3DNOW #endif #endif //ARCH_X86 @@ -1770,7 +1770,7 @@ static SwsFunc getSwsFunc(SwsContext *c) { int flags = c->flags; -#if defined(RUNTIME_CPUDETECT) && CONFIG_GPL +#if CONFIG_RUNTIME_CPUDETECT && CONFIG_GPL #if ARCH_X86 // ordered per speed fastest first if (flags & SWS_CPU_CAPS_MMX2) { @@ -1800,7 +1800,7 @@ static SwsFunc getSwsFunc(SwsContext *c) sws_init_swScale_C(c); return swScale_C; #endif /* ARCH_X86 */ -#else //RUNTIME_CPUDETECT +#else //CONFIG_RUNTIME_CPUDETECT #if HAVE_MMX2 sws_init_swScale_MMX2(c); return swScale_MMX2; @@ -1817,7 +1817,7 @@ static SwsFunc getSwsFunc(SwsContext *c) sws_init_swScale_C(c); return swScale_C; #endif -#endif //!RUNTIME_CPUDETECT +#endif //!CONFIG_RUNTIME_CPUDETECT } static int PlanarToNV12Wrapper(SwsContext *c, uint8_t* src[], int srcStride[], int srcSliceY, @@ -2397,7 +2397,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d __asm__ volatile("emms\n\t"::: "memory"); #endif -#if !defined(RUNTIME_CPUDETECT) || !CONFIG_GPL //ensure that the flags match the compiled variant if cpudetect is off +#if !CONFIG_RUNTIME_CPUDETECT || !CONFIG_GPL //ensure that the flags match the compiled variant if cpudetect is off flags &= ~(SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2|SWS_CPU_CAPS_3DNOW|SWS_CPU_CAPS_ALTIVEC|SWS_CPU_CAPS_BFIN); #if HAVE_MMX2 flags |= SWS_CPU_CAPS_MMX|SWS_CPU_CAPS_MMX2; @@ -2410,7 +2410,7 @@ SwsContext *sws_getContext(int srcW, int srcH, enum PixelFormat srcFormat, int d #elif ARCH_BFIN flags |= SWS_CPU_CAPS_BFIN; #endif -#endif /* RUNTIME_CPUDETECT */ +#endif /* CONFIG_RUNTIME_CPUDETECT */ if (clip_table[512] != 255) globalInit(); if (!rgb15to16) sws_rgb2rgb_init(flags); |