summaryrefslogtreecommitdiffstats
path: root/media/base/yuv_convert.cc
diff options
context:
space:
mode:
authorearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 23:44:56 +0000
committerearthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-03 23:44:56 +0000
commitfcdc66cc78fe312bd82ca5a04eb1cdf821eab5e1 (patch)
tree309a0833974aaf8b8a453186f076d8f15aa57bd9 /media/base/yuv_convert.cc
parentc0b58a87ff6773ab53c23ebbe0c8dc4eec03049d (diff)
downloadchromium_src-fcdc66cc78fe312bd82ca5a04eb1cdf821eab5e1.zip
chromium_src-fcdc66cc78fe312bd82ca5a04eb1cdf821eab5e1.tar.gz
chromium_src-fcdc66cc78fe312bd82ca5a04eb1cdf821eab5e1.tar.bz2
Do not use assembly implementations of YUV conversions in MSan builds.
MemorySanitizer is confused by assembly code. BUG=178409 R=dalecurtis@chromium.org Review URL: https://codereview.chromium.org/139783016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/yuv_convert.cc')
-rw-r--r--media/base/yuv_convert.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc
index 893b53d..9dc0559 100644
--- a/media/base/yuv_convert.cc
+++ b/media/base/yuv_convert.cc
@@ -132,7 +132,8 @@ void InitializeCPUSpecificYUVConversions() {
g_convert_yuva_to_argb_proc_ = ConvertYUVAToARGB_C;
g_empty_register_state_proc_ = EmptyRegisterStateStub;
-#if defined(ARCH_CPU_X86_FAMILY)
+ // Assembly code confuses MemorySanitizer.
+#if defined(ARCH_CPU_X86_FAMILY) && !defined(MEMORY_SANITIZER)
base::CPU cpu;
if (cpu.has_mmx()) {
g_convert_yuv_to_rgb32_row_proc_ = ConvertYUVToRGB32Row_MMX;