diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 21:13:42 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-04 21:13:42 +0000 |
| commit | 95fe390b98883c2ae8f896914615d24e87841ba0 (patch) | |
| tree | 08e9bddd7992db38c15e6ed82d8232d23422baf8 /media | |
| parent | fee00934a491edf64b615cc5d34a01de17736fec (diff) | |
| download | chromium_src-95fe390b98883c2ae8f896914615d24e87841ba0.zip chromium_src-95fe390b98883c2ae8f896914615d24e87841ba0.tar.gz chromium_src-95fe390b98883c2ae8f896914615d24e87841ba0.tar.bz2 | |
Lands http://codereview.chromium.org/99349 for Ryan.
Comments from Ryan:
Some small changes to get chromium building on ARM. I tested these using the
standard Linux tool chain and crosstools-ng.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/99365
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15241 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/yuv_convert.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index dd40c9f..3ba6863 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -77,8 +77,13 @@ // C++ code provided as a fall back. // Compile with /DUSE_MMX=0 #ifndef USE_MMX + +#ifdef ARCH_CPU_ARM_FAMILY +#define USE_MMX 0 +#else #define USE_MMX 1 #endif +#endif namespace media { @@ -670,4 +675,3 @@ void ConvertYV12ToRGB32Row(const uint8* y_buf, } // namespace media - |