diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-26 09:59:43 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-26 09:59:43 +0100 |
| commit | 8f045f413e935ef9e7fdcef55c52343686a0f1aa (patch) | |
| tree | 273230a3c167830828106002137e33a981c5a04d /src/3rdparty/libwebp/src/mux/muxedit.c | |
| parent | 0870e670665a702665948723bb7b1eb61a9572a8 (diff) | |
| parent | cd2de115c6216ad747cf4803e65a4ce4af220795 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Change-Id: I8a8151eb2dd01059cf86da8f72ecb65612bff0c1
Diffstat (limited to 'src/3rdparty/libwebp/src/mux/muxedit.c')
| -rw-r--r-- | src/3rdparty/libwebp/src/mux/muxedit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/libwebp/src/mux/muxedit.c b/src/3rdparty/libwebp/src/mux/muxedit.c index b27663f..9bbed42 100644 --- a/src/3rdparty/libwebp/src/mux/muxedit.c +++ b/src/3rdparty/libwebp/src/mux/muxedit.c @@ -558,8 +558,8 @@ static WebPMuxError CreateVP8XChunk(WebPMux* const mux) { height = mux->canvas_height_; } - if (flags == 0) { - // For Simple Image, VP8X chunk should not be added. + if (flags == 0 && mux->unknown_ == NULL) { + // For simple file format, VP8X chunk should not be added. return WEBP_MUX_OK; } |