diff --git a/README.chromium b/README.chromium index 6cd728662..361a3b33f 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 972 +Version: 973 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index e1d3fdca9..3ae010b22 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 972 +#define LIBYUV_VERSION 973 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index 3fb7b0835..75851ea16 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -14,7 +14,7 @@ 'use_system_libjpeg%': 0, 'build_neon': 0, 'conditions': [ - ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { + ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1))', { 'build_neon': 1, }], ], @@ -27,9 +27,6 @@ 'target_name': 'libyuv_neon', 'type': 'static_library', 'standalone_static_library': 1, - 'defines': [ - 'LIBYUV_NEON', - ], # TODO(noahric): This should remove whatever mfpu is set, not # just vfpv3-d16. 'cflags!': [