Permalink
Browse files

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>
  • Loading branch information...
1 parent bb3ed3b commit 08bd8c8ab37e56bf567a8081fed820d12b05d153 @XhmikosR XhmikosR committed with michaelni Aug 19, 2012
Showing with 62 additions and 62 deletions.
  1. +11 −11 libpostproc/postprocess.c
  2. +49 −49 libpostproc/postprocess_template.c
  3. +1 −1 libswscale/swscale.c
  4. +1 −1 libswscale/x86/swscale.c
View
@@ -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);
Oops, something went wrong.

0 comments on commit 08bd8c8

Please sign in to comment.