diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:58:45 +0200 |
| commit | 6727ae3172aa7c3a791efd839ebefe24a4b8134c (patch) | |
| tree | 63ecf158da5ba45bc5501e7bcaf7f57df2ed56f8 /src/3rdparty/libwebp/src/mux/muxi.h | |
| parent | 405bfa87e6f1c5b7fe89efa4b566f99d01375567 (diff) | |
| parent | 454fb13c465e29f0d0f9a295bdb822b4a09c7e48 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Id8a59a58c7e5ca2f977c1e7408ff05033a9cc16b
Diffstat (limited to 'src/3rdparty/libwebp/src/mux/muxi.h')
| -rw-r--r-- | src/3rdparty/libwebp/src/mux/muxi.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/libwebp/src/mux/muxi.h b/src/3rdparty/libwebp/src/mux/muxi.h index 277d5fb..718b2f5 100644 --- a/src/3rdparty/libwebp/src/mux/muxi.h +++ b/src/3rdparty/libwebp/src/mux/muxi.h @@ -28,7 +28,7 @@ extern "C" { #define MUX_MAJ_VERSION 0 #define MUX_MIN_VERSION 2 -#define MUX_REV_VERSION 0 +#define MUX_REV_VERSION 2 // Chunk object. typedef struct WebPChunk WebPChunk; @@ -65,7 +65,9 @@ struct WebPMux { WebPChunk* anim_; WebPChunk* vp8x_; - WebPChunk* unknown_; + WebPChunk* unknown_; + int canvas_width_; + int canvas_height_; }; // CHUNK_INDEX enum: used for indexing within 'kChunks' (defined below) only. |