diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-09 10:22:13 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-11 20:05:19 +0000 |
| commit | b114e552211456fbde3ff6ca2da21cbc8d1e90e2 (patch) | |
| tree | 9c033ea7bcc9cc7314eaa8aff57356b2ae301257 /src/3rdparty/libwebp/src/mux/muxedit.c | |
| parent | 1d4f24820c0fff474d524e006d715e13e409a4b8 (diff) | |
| download | qtimageformats-b114e552211456fbde3ff6ca2da21cbc8d1e90e2.tar.gz | |
libwebp: update to 0.5.0
This commit imports libwebp 0.5.0, including AUTHORS, COPYING, ChangeLog,
NEWS, PATENTS, README and src directories. In src, only includes header
and source files.
The patches required to build it in Qt will follow in separate
commit(s).
Change-Id: I96b4961ba63c75cc7fbab158c36a0f403f254c14
Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
Diffstat (limited to 'src/3rdparty/libwebp/src/mux/muxedit.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/mux/muxedit.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/3rdparty/libwebp/src/mux/muxedit.c b/src/3rdparty/libwebp/src/mux/muxedit.c index 24ca471..b27663f 100644 --- a/src/3rdparty/libwebp/src/mux/muxedit.c +++ b/src/3rdparty/libwebp/src/mux/muxedit.c @@ -278,11 +278,9 @@ WebPMuxError WebPMuxPushFrame(WebPMux* mux, const WebPMuxFrameInfo* frame, if (!(is_frame || (frame->id == WEBP_CHUNK_FRGM))) { return WEBP_MUX_INVALID_ARGUMENT; } -#ifndef WEBP_EXPERIMENTAL_FEATURES - if (frame->id == WEBP_CHUNK_FRGM) { // disabled for now. + if (frame->id == WEBP_CHUNK_FRGM) { // Dead experiment. return WEBP_MUX_INVALID_ARGUMENT; } -#endif if (bitstream->bytes == NULL || bitstream->size > MAX_CHUNK_PAYLOAD) { return WEBP_MUX_INVALID_ARGUMENT; @@ -362,7 +360,6 @@ WebPMuxError WebPMuxSetAnimationParams(WebPMux* mux, return MuxSet(mux, kChunks[IDX_ANIM].tag, 1, &anim, 1); } -#if WEBP_MUX_ABI_VERSION > 0x0101 WebPMuxError WebPMuxSetCanvasSize(WebPMux* mux, int width, int height) { WebPMuxError err; @@ -388,7 +385,6 @@ WebPMuxError WebPMuxSetCanvasSize(WebPMux* mux, mux->canvas_height_ = height; return WEBP_MUX_OK; } -#endif //------------------------------------------------------------------------------ // Delete API(s). |