summaryrefslogtreecommitdiffstats
path: root/third_party/libwebp
diff options
context:
space:
mode:
Diffstat (limited to 'third_party/libwebp')
-rw-r--r--third_party/libwebp/README.chromium1
-rw-r--r--third_party/libwebp/dsp/enc_neon.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/third_party/libwebp/README.chromium b/third_party/libwebp/README.chromium
index 485c05f..bdc4fdb 100644
--- a/third_party/libwebp/README.chromium
+++ b/third_party/libwebp/README.chromium
@@ -23,3 +23,4 @@ Local changes:
Cherry-picks:
Revert patch f7fc4bc: dec/webp.c: don't wait for data before reporting w/h
6638710 webp/types.h: use inline for clang++/-std=c++11
+ a3946b8 enc_neon: fix building with non-Xcode clang (iOS)
diff --git a/third_party/libwebp/dsp/enc_neon.c b/third_party/libwebp/dsp/enc_neon.c
index 42041f73..bcab8ff 100644
--- a/third_party/libwebp/dsp/enc_neon.c
+++ b/third_party/libwebp/dsp/enc_neon.c
@@ -1013,7 +1013,8 @@ static int QuantizeBlock(int16_t in[16], int16_t out[16],
const int16x8_t out1 = Quantize(in, mtx, 8);
uint8x8x4_t shuffles;
// vtbl4_u8 is marked unavailable for iOS arm64, use wider versions there.
-#if defined(__APPLE__) && defined(__aarch64__)
+#if defined(__APPLE__) && defined(__aarch64__) && \
+ defined(__apple_build_version__)
uint8x16x2_t all_out;
INIT_VECTOR2(all_out, vreinterpretq_u8_s16(out0), vreinterpretq_u8_s16(out1));
INIT_VECTOR4(shuffles,