summaryrefslogtreecommitdiffstats
path: root/media/base/yuv_row.h
diff options
context:
space:
mode:
authormhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-12 03:53:20 +0000
committermhm@chromium.org <mhm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-12 03:53:20 +0000
commit8e5722d2311e0a91cca92692c012e64bb01fb2cf (patch)
treeb2fbb97013b1b71c2b43f9dafe92792282d4effb /media/base/yuv_row.h
parenteb268a94c2f15e9fb647f89dad2e312546e57095 (diff)
downloadchromium_src-8e5722d2311e0a91cca92692c012e64bb01fb2cf.zip
chromium_src-8e5722d2311e0a91cca92692c012e64bb01fb2cf.tar.gz
chromium_src-8e5722d2311e0a91cca92692c012e64bb01fb2cf.tar.bz2
Reverting 26070 from media tests failure
6 failed media_unittests - CreateFrame - Clamp - YV12 - YV16 - YV12 - YV16 TBR=fbarchard BUG=none TEST=none Review URL: http://codereview.chromium.org/202068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/yuv_row.h')
-rw-r--r--media/base/yuv_row.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/media/base/yuv_row.h b/media/base/yuv_row.h
index 37bd935..104b9c7 100644
--- a/media/base/yuv_row.h
+++ b/media/base/yuv_row.h
@@ -63,8 +63,9 @@ void ScaleYUVToRGB32Row(const uint8* y_buf,
} // extern "C"
#if !defined(USE_MMX)
-// Windows, Mac and Linux x86 use MMX; x64 and other CPUs do not.
-#if defined(OS_WIN) || defined(ARCH_CPU_X86)
+#if defined(_MSC_VER)
+#define USE_MMX 1
+#elif defined(OS_LINUX) && defined(ARCH_CPU_X86)
#define USE_MMX 1
#else
#define USE_MMX 0