Merge "Revert "Fix decodes on 64-bit devices built with clang-3.8"" am: 9952695a90
am: 530260ea5d
Change-Id: I241dd2de95483dc350a35215f803f24edf37565e
diff --git a/README.android b/README.android
index f87ac58..80d2221 100644
--- a/README.android
+++ b/README.android
@@ -13,8 +13,6 @@
- Added a local copy of cpu-features.[hc] to src/dsp
- Removed WEBP_ANDROID_NEON check in dsp.h to avoid breaking non-NEON builds
where the flags in Android.mk are not set correctly currently.
-- Marked variable "status" in WebPParseHeaders as volatile to work around
- b/25845393
The Android.mk file creates WebP decoder and encoder static libraries which
can be added to any application by adding to LOCAL_STATIC_LIBRARIES
diff --git a/src/dec/webp.c b/src/dec/webp.c
index d0b912f..57af950 100644
--- a/src/dec/webp.c
+++ b/src/dec/webp.c
@@ -415,8 +415,7 @@
}
VP8StatusCode WebPParseHeaders(WebPHeaderStructure* const headers) {
- // status is marked volatile as a workaround for a clang-3.8 (aarch64) bug
- volatile VP8StatusCode status;
+ VP8StatusCode status;
int has_animation = 0;
assert(headers != NULL);
// fill out headers, ignore width/height/has_alpha.
