diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
| commit | 58537e28ecd584eab876aee8be7156509866d23a (patch) | |
| tree | 8988984e52090aaadf33cff139d7dd212cd13656 /media/base/sinc_resampler.cc | |
| parent | 0a1b11dee8e5cb2520121c300858fea6138e3c54 (diff) | |
| download | chromium_org-58537e28ecd584eab876aee8be7156509866d23a.tar.gz | |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
Diffstat (limited to 'media/base/sinc_resampler.cc')
| -rw-r--r-- | media/base/sinc_resampler.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/base/sinc_resampler.cc b/media/base/sinc_resampler.cc index a2918c3f0d..5566f64ce8 100644 --- a/media/base/sinc_resampler.cc +++ b/media/base/sinc_resampler.cc @@ -108,9 +108,8 @@ static double SincScaleFactor(double io_ratio) { // If we know the minimum architecture at compile time, avoid CPU detection. // Force NaCl code to use C routines since (at present) nothing there uses these -// methods and plumbing the -msse built library is non-trivial. iOS lies -// about its architecture, so we also need to exclude it here. -#if defined(ARCH_CPU_X86_FAMILY) && !defined(OS_NACL) && !defined(OS_IOS) +// methods and plumbing the -msse built library is non-trivial. +#if defined(ARCH_CPU_X86_FAMILY) && !defined(OS_NACL) #if defined(__SSE__) #define CONVOLVE_FUNC Convolve_SSE void SincResampler::InitializeCPUSpecificFeatures() {} |