diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2007-06-07 17:18:01 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-06-07 17:18:01 +0000 |
| commit | 3d4e3e560ffdff20339ed9f6807df284024213b6 (patch) | |
| tree | 13767b41de4a7b16cc21bb84b65098a977a797ae | |
| parent | ac237a2f5d7b5eaa20b603ca225610c4282aa239 (diff) | |
| download | ffmpeg-3d4e3e560ffdff20339ed9f6807df284024213b6.tar.gz | |
Use FFmpeg-specific CPU feature definitions.
taken from a patch by Ronald S. Bultje, rbultje ronald.bitfreak net
Date: Thu, 07 Jun 2007 08:57:46 -0400
Subject: Re: [FFmpeg-devel] [PATCH] Coremake support - ffmpeg_nommx.patch (1/1)
- ffmpeg-nommx.patch (1/1) - ff-cputest-noavconfig.patch (1/1)
Originally committed as revision 9250 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/i386/cputest.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/i386/cputest.c b/libavcodec/i386/cputest.c index fe751fb5b8..b8f505564a 100644 --- a/libavcodec/i386/cputest.c +++ b/libavcodec/i386/cputest.c @@ -80,15 +80,15 @@ int mm_support(void) if(max_std_level >= 1){ cpuid(1, eax, ebx, ecx, std_caps); if (std_caps & (1<<23)) - rval |= MM_MMX; + rval |= FF_MM_MMX; if (std_caps & (1<<25)) - rval |= MM_MMXEXT | MM_SSE; + rval |= FF_MM_MMXEXT | FF_MM_SSE; if (std_caps & (1<<26)) - rval |= MM_SSE2; + rval |= FF_MM_SSE2; if (ecx & 1) - rval |= MM_SSE3; + rval |= FF_MM_SSE3; if (ecx & 0x00000200 ) - rval |= MM_SSSE3; + rval |= FF_MM_SSSE3; } cpuid(0x80000000, max_ext_level, ebx, ecx, edx); @@ -96,25 +96,25 @@ int mm_support(void) if(max_ext_level >= 0x80000001){ cpuid(0x80000001, eax, ebx, ecx, ext_caps); if (ext_caps & (1<<31)) - rval |= MM_3DNOW; + rval |= FF_MM_3DNOW; if (ext_caps & (1<<30)) - rval |= MM_3DNOWEXT; + rval |= FF_MM_3DNOWEXT; if (ext_caps & (1<<23)) - rval |= MM_MMX; + rval |= FF_MM_MMX; if (ext_caps & (1<<22)) - rval |= MM_MMXEXT; + rval |= FF_MM_MMXEXT; } #if 0 av_log(NULL, AV_LOG_DEBUG, "%s%s%s%s%s%s%s%s\n", - (rval&MM_MMX) ? "MMX ":"", - (rval&MM_MMXEXT) ? "MMX2 ":"", - (rval&MM_SSE) ? "SSE ":"", - (rval&MM_SSE2) ? "SSE2 ":"", - (rval&MM_SSE3) ? "SSE3 ":"", - (rval&MM_SSSE3) ? "SSSE3 ":"", - (rval&MM_3DNOW) ? "3DNow ":"", - (rval&MM_3DNOWEXT) ? "3DNowExt ":""); + (rval&FF_MM_MMX) ? "MMX ":"", + (rval&FF_MM_MMXEXT) ? "MMX2 ":"", + (rval&FF_MM_SSE) ? "SSE ":"", + (rval&FF_MM_SSE2) ? "SSE2 ":"", + (rval&FF_MM_SSE3) ? "SSE3 ":"", + (rval&FF_MM_SSSE3) ? "SSSE3 ":"", + (rval&FF_MM_3DNOW) ? "3DNow ":"", + (rval&FF_MM_3DNOWEXT) ? "3DNowExt ":""); #endif return rval; } |