diff --git a/README.chromium b/README.chromium index 8beb79659..e021286b9 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1268 +Version: 1269 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 04c9997b4..666921c52 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 1268 +#define LIBYUV_VERSION 1269 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_posix.cc b/source/row_posix.cc index b8e96ccef..ce6df4928 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -1589,7 +1589,7 @@ void OMITFP I422ToRGB24Row_SSSE3(const uint8* y_buf, [v_buf]"+r"(v_buf), // %[v_buf] [dst_rgb24]"+r"(dst_rgb24), // %[dst_rgb24] // TODO(fbarchard): Make width a register for 32 bit. -#if defined(__APPLE__) && defined(__i386__) +#if defined(__i386__) && defined(__pic__) [width]"+m"(width) // %[width] #else [width]"+rm"(width) // %[width] @@ -1633,7 +1633,7 @@ void OMITFP I422ToRAWRow_SSSE3(const uint8* y_buf, [v_buf]"+r"(v_buf), // %[v_buf] [dst_raw]"+r"(dst_raw), // %[dst_raw] // TODO(fbarchard): Make width a register for 32 bit. -#if defined(__APPLE__) && defined(__i386__) +#if defined(__i386__) && defined(__pic__) [width]"+m"(width) // %[width] #else [width]"+rm"(width) // %[width]