From d317a70c1d15efbf04e970e79ee1d1e042830819 Mon Sep 17 00:00:00 2001 From: Frank Barchard Date: Mon, 24 Aug 2015 14:21:04 -0700 Subject: [PATCH] llvm64 link error fix. R=harryjin@google.com BUG=libyuv:485 Review URL: https://webrtc-codereview.appspot.com/58479004. --- .gitignore | 1 + README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_common.cc | 3 ++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7751dddb8..f4745c353 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc .gn +pin-log.txt build buildtools chromium/.gclient.tmp diff --git a/README.chromium b/README.chromium index 93d5b1840..e54b46899 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1472 +Version: 1473 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 5bc5f2f78..5ed7b2aa3 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1472 +#define LIBYUV_VERSION 1473 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_common.cc b/source/row_common.cc index b8b3d09dd..dcd0e4121 100644 --- a/source/row_common.cc +++ b/source/row_common.cc @@ -2159,7 +2159,8 @@ void I422ToUYVYRow_C(const uint8* src_y, // Maximum temporary width for wrappers to process at a time, in pixels. #define MAXTWIDTH 2048 -#if !defined(_MSC_VER) && defined(HAS_I422TORGB565ROW_SSSE3) +#if !(defined(_MSC_VER) && defined(_M_IX86)) && \ + defined(HAS_I422TORGB565ROW_SSSE3) // row_win.cc has asm version, but GCC uses 2 step wrapper. void I422ToRGB565Row_SSSE3(const uint8* src_y, const uint8* src_u,