| Index: media/base/yuv_convert.cc
|
| diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc
|
| index d4c1d900b2cc5decb8095fcb46566d7662a92fad..9bc9a93197c042112c587ced34806a9601346647 100644
|
| --- a/media/base/yuv_convert.cc
|
| +++ b/media/base/yuv_convert.cc
|
| @@ -244,8 +244,9 @@ void InitializeCPUSpecificYUVConversions() {
|
| g_convert_yuva_to_argb_proc_ = ConvertYUVAToARGB_C;
|
| g_empty_register_state_proc_ = EmptyRegisterStateStub;
|
|
|
| - // Assembly code confuses MemorySanitizer.
|
| -#if defined(ARCH_CPU_X86_FAMILY) && !defined(MEMORY_SANITIZER)
|
| + // Assembly code confuses MemorySanitizer. Also not available in iOS builds.
|
| +#if defined(ARCH_CPU_X86_FAMILY) && !defined(MEMORY_SANITIZER) && \
|
| + !defined(OS_IOS)
|
| g_convert_yuva_to_argb_proc_ = ConvertYUVAToARGB_MMX;
|
|
|
| #if defined(MEDIA_MMX_INTRINSICS_AVAILABLE)
|
|
|