summaryrefslogtreecommitdiff
path: root/thirdparty/libwebp/src/webp
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-03-04 13:02:20 +0100
committerRémi Verschelde <rverschelde@gmail.com>2019-03-04 13:13:33 +0100
commit93f6a065f8e0e083582890a245b7dcc3cd8c7ef6 (patch)
tree9682b2cf1b763dc9f62ab6d4fdbf75a007afe22e /thirdparty/libwebp/src/webp
parent2bc981948d254f45a0268cfc26eb0010f00b984c (diff)
libwebp: Sync with upstream 1.0.2
Diffstat (limited to 'thirdparty/libwebp/src/webp')
-rw-r--r--thirdparty/libwebp/src/webp/decode.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/thirdparty/libwebp/src/webp/decode.h b/thirdparty/libwebp/src/webp/decode.h
index 95d31e7619..ae8bfe840e 100644
--- a/thirdparty/libwebp/src/webp/decode.h
+++ b/thirdparty/libwebp/src/webp/decode.h
@@ -42,6 +42,12 @@ WEBP_EXTERN int WebPGetDecoderVersion(void);
// This function will also validate the header, returning true on success,
// false otherwise. '*width' and '*height' are only valid on successful return.
// Pointers 'width' and 'height' can be passed NULL if deemed irrelevant.
+// Note: The following chunk sequences (before the raw VP8/VP8L data) are
+// considered valid by this function:
+// RIFF + VP8(L)
+// RIFF + VP8X + (optional chunks) + VP8(L)
+// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose.
+// VP8(L) <-- Not a valid WebP format: only allowed for internal purpose.
WEBP_EXTERN int WebPGetInfo(const uint8_t* data, size_t data_size,
int* width, int* height);
@@ -425,6 +431,12 @@ WEBP_EXTERN VP8StatusCode WebPGetFeaturesInternal(
// Returns VP8_STATUS_OK when the features are successfully retrieved. Returns
// VP8_STATUS_NOT_ENOUGH_DATA when more data is needed to retrieve the
// features from headers. Returns error in other cases.
+// Note: The following chunk sequences (before the raw VP8/VP8L data) are
+// considered valid by this function:
+// RIFF + VP8(L)
+// RIFF + VP8X + (optional chunks) + VP8(L)
+// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose.
+// VP8(L) <-- Not a valid WebP format: only allowed for internal purpose.
static WEBP_INLINE VP8StatusCode WebPGetFeatures(
const uint8_t* data, size_t data_size,
WebPBitstreamFeatures* features) {