Bug 1027323 - Fix the libyuv linking issues with clang-cl; r=jesup
authorJeff Muizelaar <jmuizelaar@mozilla.com>
Sat, 21 Jun 2014 08:56:48 -0400
changeset 189903 a148b3bc11437be9df8dac894c42f99fc7a6e837
parent 189902 c1ede3f05ea7150f5db57f7bfeebff93823befdf
child 189904 2342853a754fc8ef23786ef79553967e33d55c11
push id45190
push usereakhgari@mozilla.com
push dateSat, 21 Jun 2014 12:57:07 +0000
treeherdermozilla-inbound@a148b3bc1143 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1027323
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1027323 - Fix the libyuv linking issues with clang-cl; r=jesup
media/libyuv/source/row_common.cc
--- a/media/libyuv/source/row_common.cc
+++ b/media/libyuv/source/row_common.cc
@@ -2019,17 +2019,17 @@ void I422ToUYVYRow_C(const uint8* src_y,
     dst_frame[1] = src_y[0];
     dst_frame[2] = src_v[0];
     dst_frame[3] = src_y[0];  // duplicate last y
   }
 }
 
 #if !defined(LIBYUV_DISABLE_X86) && defined(HAS_I422TOARGBROW_SSSE3)
 // row_win.cc has asm version, but GCC uses 2 step wrapper.
-#if defined(__x86_64__) || defined(__i386__)
+#if (defined(__x86_64__) || defined(__i386__)) && !defined(_MSC_VER)
 void I422ToRGB565Row_SSSE3(const uint8* src_y,
                            const uint8* src_u,
                            const uint8* src_v,
                            uint8* rgb_buf,
                            int width) {
   // Allocate a row of ARGB.
   align_buffer_64(row, width * 4);
   I422ToARGBRow_SSSE3(src_y, src_u, src_v, row, width);