diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2001-11-26 02:20:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2001-11-26 02:20:51 +0000 |
| commit | 48a05ceccdc4ea88570c18f3d6b20624b9124083 (patch) | |
| tree | 980725897893901fe6fe2809b703638d263c5977 | |
| parent | 1de97d8422eac491cc1c0b8b49c9358ce4ad8167 (diff) | |
| download | ffmpeg-48a05ceccdc4ea88570c18f3d6b20624b9124083.tar.gz | |
oops
Originally committed as revision 3137 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
| -rw-r--r-- | postproc/swscale.c | 1 | ||||
| -rw-r--r-- | postproc/swscale_template.c | 28 |
2 files changed, 28 insertions, 1 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c index 7afb61b2b4..8073552a3c 100644 --- a/postproc/swscale.c +++ b/postproc/swscale.c @@ -9,7 +9,6 @@ #include <string.h> #include "../config.h" #include "swscale.h" -#include "../mmx_defs.h" #include "../cpudetect.h" #undef MOVNTQ #undef PAVGB diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c index 256d933365..3445f92f30 100644 --- a/postproc/swscale_template.c +++ b/postproc/swscale_template.c @@ -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" |