diff options
| author | Diego Biurrun <diego@biurrun.de> | 2009-01-25 19:58:33 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2009-01-25 19:58:33 +0000 |
| commit | f4406ec177f1745ef0ad40773976eae965d12424 (patch) | |
| tree | ea31dddfb805ca02258315b6e00330354f019efa /libswscale/rgb2rgb.c | |
| parent | ebc3209a7d88b1896a20511da5ef2aad8a7c01de (diff) | |
| download | ffmpeg-f4406ec177f1745ef0ad40773976eae965d12424.tar.gz | |
HAVE_3DNOW --> HAVE_AMD3DNOW to sync with latest configure changes.
Originally committed as revision 28358 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/rgb2rgb.c')
| -rw-r--r-- | libswscale/rgb2rgb.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libswscale/rgb2rgb.c b/libswscale/rgb2rgb.c index 5b79fea761..99be2a4f27 100644 --- a/libswscale/rgb2rgb.c +++ b/libswscale/rgb2rgb.c @@ -139,11 +139,11 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; //plain C versions #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE2 #define HAVE_MMX 0 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define HAVE_SSE2 0 #define RENAME(a) a ## _C #include "rgb2rgb_template.c" @@ -167,9 +167,9 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; //3DNOW versions #undef RENAME #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX2 0 -#define HAVE_3DNOW 1 +#define HAVE_AMD3DNOW 1 #define RENAME(a) a ## _3DNOW #include "rgb2rgb_template.c" @@ -183,7 +183,7 @@ DECLARE_ASM_CONST(8, uint64_t, blue_15mask) = 0x0000001f0000001fULL; */ void sws_rgb2rgb_init(int flags){ -#if (HAVE_MMX2 || HAVE_3DNOW || HAVE_MMX) && CONFIG_GPL +#if (HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX) && CONFIG_GPL if (flags & SWS_CPU_CAPS_MMX2) rgb2rgb_init_MMX2(); else if (flags & SWS_CPU_CAPS_3DNOW) @@ -191,7 +191,7 @@ void sws_rgb2rgb_init(int flags){ else if (flags & SWS_CPU_CAPS_MMX) rgb2rgb_init_MMX(); else -#endif /* HAVE_MMX2 || HAVE_3DNOW || HAVE_MMX */ +#endif /* HAVE_MMX2 || HAVE_AMD3DNOW || HAVE_MMX */ rgb2rgb_init_C(); } |