summaryrefslogtreecommitdiff
path: root/libswscale/swscale.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2011-05-24 10:19:41 -0400
committerRonald S. Bultje <rsbultje@gmail.com>2011-05-24 10:19:41 -0400
commit1dd4f4be5a82409a162b42b120fc5054fef9d899 (patch)
tree17248fac0bab48bc40ffe647158ffca8a076a761 /libswscale/swscale.c
parentfe43d5d71e1b272e1176232a34074c8c9bc0c61d (diff)
swscale: remove AMD3DNOW "optimizations".
The functions are identical to their MMX counterparts. Thus, pretending that swscale is highly optimized for AMD3DNOW extensions is a poorly executed practical joke at best.
Diffstat (limited to 'libswscale/swscale.c')
-rw-r--r--libswscale/swscale.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index 4977a3a736..5b71a6f1c0 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -1178,7 +1178,6 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uin
//Plain C versions
#define COMPILE_TEMPLATE_MMX2 0
-#define COMPILE_TEMPLATE_AMD3DNOW 0
#define COMPILE_TEMPLATE_ALTIVEC 0
#include "swscale_template.c"
@@ -1195,9 +1194,7 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uin
#if HAVE_MMX
#undef RENAME
#undef COMPILE_TEMPLATE_MMX2
-#undef COMPILE_TEMPLATE_AMD3DNOW
#define COMPILE_TEMPLATE_MMX2 0
-#define COMPILE_TEMPLATE_AMD3DNOW 0
#define RENAME(a) a ## _MMX
#include "x86/swscale_template.c"
#endif
@@ -1206,24 +1203,11 @@ static inline void monoblack2Y(uint8_t *dst, const uint8_t *src, long width, uin
#if HAVE_MMX2
#undef RENAME
#undef COMPILE_TEMPLATE_MMX2
-#undef COMPILE_TEMPLATE_AMD3DNOW
#define COMPILE_TEMPLATE_MMX2 1
-#define COMPILE_TEMPLATE_AMD3DNOW 0
#define RENAME(a) a ## _MMX2
#include "x86/swscale_template.c"
#endif
-//3DNOW versions
-#if HAVE_AMD3DNOW
-#undef RENAME
-#undef COMPILE_TEMPLATE_MMX2
-#undef COMPILE_TEMPLATE_AMD3DNOW
-#define COMPILE_TEMPLATE_MMX2 0
-#define COMPILE_TEMPLATE_AMD3DNOW 1
-#define RENAME(a) a ## _3DNow
-#include "x86/swscale_template.c"
-#endif
-
SwsFunc ff_getSwsFunc(SwsContext *c)
{
int cpu_flags = av_get_cpu_flags();
@@ -1237,12 +1221,6 @@ SwsFunc ff_getSwsFunc(SwsContext *c)
return swScale_MMX2;
} else
#endif
-#if HAVE_AMD3DNOW
- if (cpu_flags & AV_CPU_FLAG_3DNOW) {
- sws_init_swScale_3DNow(c);
- return swScale_3DNow;
- } else
-#endif
#if HAVE_MMX
if (cpu_flags & AV_CPU_FLAG_MMX) {
sws_init_swScale_MMX(c);