diff options
-rw-r--r-- | README.chromium | 2 | ||||
-rw-r--r-- | include/libyuv/compare_row.h | 5 | ||||
-rw-r--r-- | include/libyuv/planar_functions.h | 5 | ||||
-rw-r--r-- | include/libyuv/rotate_row.h | 5 | ||||
-rw-r--r-- | include/libyuv/row.h | 5 | ||||
-rw-r--r-- | include/libyuv/scale_row.h | 5 | ||||
-rw-r--r-- | include/libyuv/version.h | 2 |
7 files changed, 22 insertions, 7 deletions
diff --git a/README.chromium b/README.chromium index 0b9762f5..c68be174 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: https://chromium.googlesource.com/libyuv/libyuv/ -Version: 1874 +Version: 1875 License: BSD License File: LICENSE Shipped: yes diff --git a/include/libyuv/compare_row.h b/include/libyuv/compare_row.h index d8e82d72..8293c919 100644 --- a/include/libyuv/compare_row.h +++ b/include/libyuv/compare_row.h @@ -28,7 +28,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif diff --git a/include/libyuv/planar_functions.h b/include/libyuv/planar_functions.h index 8256fcaa..f9344721 100644 --- a/include/libyuv/planar_functions.h +++ b/include/libyuv/planar_functions.h @@ -30,7 +30,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif diff --git a/include/libyuv/rotate_row.h b/include/libyuv/rotate_row.h index 2dd8c03d..3e6a2fef 100644 --- a/include/libyuv/rotate_row.h +++ b/include/libyuv/rotate_row.h @@ -28,7 +28,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 6fd2ab8f..0455b4cc 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -31,7 +31,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif diff --git a/include/libyuv/scale_row.h b/include/libyuv/scale_row.h index fd136ab7..c015d772 100644 --- a/include/libyuv/scale_row.h +++ b/include/libyuv/scale_row.h @@ -29,7 +29,10 @@ extern "C" { #endif // MemorySanitizer does not support assembly code yet. http://crbug.com/344505 #if defined(__has_feature) -#if __has_feature(memory_sanitizer) +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_NEON) +#define LIBYUV_DISABLE_NEON +#endif +#if __has_feature(memory_sanitizer) && !defined(LIBYUV_DISABLE_X86) #define LIBYUV_DISABLE_X86 #endif #endif diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 7c9cc54e..d45ef09d 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1874 +#define LIBYUV_VERSION 1875 #endif // INCLUDE_LIBYUV_VERSION_H_ |