summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2015-07-06 00:32:06 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2015-07-06 00:32:06 (GMT)
commit0aa4f23757cec1550cf1a7ec9de5a4488b894117 (patch)
treef92d6afd9fa1177eb85ef6cee56da417ad1696a3 /src
parent8cf0795e34e26a7c4bc728ae51af84767b250bad (diff)
parent72b8eebfa17fd92c08e3020a120fc8e9754cb4ea (diff)
downloadmxe-0aa4f23757cec1550cf1a7ec9de5a4488b894117.zip
mxe-0aa4f23757cec1550cf1a7ec9de5a4488b894117.tar.gz
mxe-0aa4f23757cec1550cf1a7ec9de5a4488b894117.tar.bz2
Merge pull request #655 from newnon/master_WEBP_fix
WebP SSE2 crash fix
Diffstat (limited to 'src')
-rw-r--r--src/libwebp-1-fixes.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/libwebp-1-fixes.patch b/src/libwebp-1-fixes.patch
new file mode 100644
index 0000000..38e4961
--- /dev/null
+++ b/src/libwebp-1-fixes.patch
@@ -0,0 +1,18 @@
+This file is part of MXE.
+See index.html for further information.
+
+Contains ad hoc patches for cross building.
+
+diff --git a/src/dec/webp.c b/src/dec/webp.c
+index 59e21a9..074f04c 100644
+--- a/src/dec/webp.c
++++ b/src/dec/webp.c
+@@ -451,7 +451,7 @@ void WebPResetDecParams(WebPDecParams* const params) {
+ // "Into" decoding variants
+
+ // Main flow
+-static VP8StatusCode DecodeInto(const uint8_t* const data, size_t data_size,
++__attribute__ ((force_align_arg_pointer)) static VP8StatusCode DecodeInto(const uint8_t* const data, size_t data_size,
+ WebPDecParams* const params) {
+ VP8StatusCode status;
+ VP8Io io;