diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-06-30 06:05:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-30 06:05:23 +0200 |
| commit | 6b25f35f84960ddb7fbfc3b4df3f244e42bb4470 (patch) | |
| tree | e7408959f9dd586159e3481120fa047f9c377b44 /media/libwebp/dec/vp8i_dec.h | |
| parent | b5b0b28441642f1c15b6ca0834bfca068bcbb154 (diff) | |
| parent | 53407e7bf2d8a1a27efef4f15ec8032014273803 (diff) | |
| download | UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar.gz UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar.lz UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.tar.xz UXP-6b25f35f84960ddb7fbfc3b4df3f244e42bb4470.zip | |
Merge pull request #566 from JustOff/PR_libwebp-1.0.0
Update libwebp to v1.0.0 + known security patches
Diffstat (limited to 'media/libwebp/dec/vp8i_dec.h')
| -rw-r--r-- | media/libwebp/dec/vp8i_dec.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/media/libwebp/dec/vp8i_dec.h b/media/libwebp/dec/vp8i_dec.h index 555853e8f..d0ef67b91 100644 --- a/media/libwebp/dec/vp8i_dec.h +++ b/media/libwebp/dec/vp8i_dec.h @@ -11,12 +11,12 @@ // // Author: Skal (pascal.massimino@gmail.com) -#ifndef WEBP_DEC_VP8I_H_ -#define WEBP_DEC_VP8I_H_ +#ifndef WEBP_DEC_VP8I_DEC_H_ +#define WEBP_DEC_VP8I_DEC_H_ #include <string.h> // for memcpy() -#include "./common_dec.h" -#include "./vp8li_dec.h" +#include "../dec/common_dec.h" +#include "../dec/vp8li_dec.h" #include "../utils/bit_reader_utils.h" #include "../utils/random_utils.h" #include "../utils/thread_utils.h" @@ -30,8 +30,8 @@ extern "C" { // Various defines and enums // version numbers -#define DEC_MAJ_VERSION 0 -#define DEC_MIN_VERSION 6 +#define DEC_MAJ_VERSION 1 +#define DEC_MIN_VERSION 0 #define DEC_REV_VERSION 0 // YUV-cache parameters. Cache is 32-bytes wide (= one cacheline). @@ -57,7 +57,6 @@ extern "C" { // '|' = left sample, '-' = top sample, '+' = top-left sample // 't' = extra top-right sample for 4x4 modes #define YUV_SIZE (BPS * 17 + BPS * 9) -#define Y_SIZE (BPS * 17) #define Y_OFF (BPS * 1 + 8) #define U_OFF (Y_OFF + BPS * 16 + BPS) #define V_OFF (U_OFF + 16) @@ -317,4 +316,4 @@ const uint8_t* VP8DecompressAlphaRows(VP8Decoder* const dec, } // extern "C" #endif -#endif /* WEBP_DEC_VP8I_H_ */ +#endif /* WEBP_DEC_VP8I_DEC_H_ */ |