# HG changeset patch # User michael # Date 1006741251 0 # Node ID b196b915fdc4c5945537e67a5fff7f3ac3562033 # Parent 168b7ed7ec55b9cb141ce60aeff6235cb5ed4e6d oops diff -r 168b7ed7ec55 -r b196b915fdc4 postproc/swscale.c --- a/postproc/swscale.c Mon Nov 26 02:16:01 2001 +0000 +++ b/postproc/swscale.c Mon Nov 26 02:20:51 2001 +0000 @@ -9,7 +9,6 @@ #include #include "../config.h" #include "swscale.h" -#include "../mmx_defs.h" #include "../cpudetect.h" #undef MOVNTQ #undef PAVGB diff -r 168b7ed7ec55 -r b196b915fdc4 postproc/swscale_template.c --- a/postproc/swscale_template.c Mon Nov 26 02:16:01 2001 +0000 +++ b/postproc/swscale_template.c Mon Nov 26 02:20:51 2001 +0000 @@ -7,6 +7,34 @@ #undef MOVNTQ #undef PAVGB +#undef PREFETCH +#undef PREFETCHW +#undef EMMS +#undef SFENCE + +#ifdef HAVE_3DNOW +/* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */ +#define EMMS "femms" +#else +#define EMMS "emms" +#endif + +#ifdef HAVE_3DNOW +#define PREFETCH "prefetch" +#define PREFETCHW "prefetchw" +#elif defined ( HAVE_MMX2 ) +#define PREFETCH "prefetchnta" +#define PREFETCHW "prefetcht0" +#else +#define PREFETCH "/nop" +#define PREFETCHW "/nop" +#endif + +#ifdef HAVE_MMX2 +#define SFENCE "sfence" +#else +#define SFENCE "/nop" +#endif #ifdef HAVE_MMX2 #define PAVGB(a,b) "pavgb " #a ", " #b " \n\t"