diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-08-19 13:19:19 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-20 17:47:25 +0200 |
| commit | 08bd8c8ab37e56bf567a8081fed820d12b05d153 (patch) | |
| tree | 55fc9f73e796f9b31c9142348a6a939d934cd6a8 /libpostproc/postprocess.c | |
| parent | bb3ed3bae6a9e6e2dbe8deeb45088453f214b770 (diff) | |
| download | ffmpeg-08bd8c8ab37e56bf567a8081fed820d12b05d153.tar.gz | |
rename the remaining instances of HAVE_MMX2 to HAVE_MMXEXT
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libpostproc/postprocess.c')
| -rw-r--r-- | libpostproc/postprocess.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 2234ba8c76..3c3f68c8ab 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -80,7 +80,7 @@ try to unroll inner for(x=0 ... loop to avoid these damn if(x ... checks #include <stdio.h> #include <stdlib.h> #include <string.h> -//#undef HAVE_MMX2 +//#undef HAVE_MMXEXT //#define HAVE_AMD3DNOW //#undef HAVE_MMX //#undef ARCH_X86 @@ -546,23 +546,23 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, #if ARCH_X86 -#if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT +#if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMXEXT) || CONFIG_RUNTIME_CPUDETECT #define COMPILE_MMX #endif -#if HAVE_MMX2 || CONFIG_RUNTIME_CPUDETECT +#if HAVE_MMXEXT || CONFIG_RUNTIME_CPUDETECT #define COMPILE_MMX2 #endif -#if (HAVE_AMD3DNOW && !HAVE_MMX2) || CONFIG_RUNTIME_CPUDETECT +#if (HAVE_AMD3DNOW && !HAVE_MMXEXT) || CONFIG_RUNTIME_CPUDETECT #define COMPILE_3DNOW #endif #endif /* ARCH_X86 */ #undef HAVE_MMX #define HAVE_MMX 0 -#undef HAVE_MMX2 -#define HAVE_MMX2 0 +#undef HAVE_MMXEXT +#define HAVE_MMXEXT 0 #undef HAVE_AMD3DNOW #define HAVE_AMD3DNOW 0 #undef HAVE_ALTIVEC @@ -595,9 +595,9 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, #ifdef COMPILE_MMX2 #undef RENAME #undef HAVE_MMX -#undef HAVE_MMX2 +#undef HAVE_MMXEXT #define HAVE_MMX 1 -#define HAVE_MMX2 1 +#define HAVE_MMXEXT 1 #define RENAME(a) a ## _MMX2 #include "postprocess_template.c" #endif @@ -606,10 +606,10 @@ static av_always_inline void do_a_deblock_C(uint8_t *src, int step, int stride, #ifdef COMPILE_3DNOW #undef RENAME #undef HAVE_MMX -#undef HAVE_MMX2 +#undef HAVE_MMXEXT #undef HAVE_AMD3DNOW #define HAVE_MMX 1 -#define HAVE_MMX2 0 +#define HAVE_MMXEXT 0 #define HAVE_AMD3DNOW 1 #define RENAME(a) a ## _3DNow #include "postprocess_template.c" @@ -652,7 +652,7 @@ static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[] postProcess_C(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); #endif #else /* CONFIG_RUNTIME_CPUDETECT */ -#if HAVE_MMX2 +#if HAVE_MMXEXT postProcess_MMX2(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); #elif HAVE_AMD3DNOW postProcess_3DNow(src, srcStride, dst, dstStride, width, height, QPs, QPStride, isColor, c); |