diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 23:18:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-21 23:37:04 +0100 |
| commit | a82f3de053a7c398418b92ee048cf1e5e83d417d (patch) | |
| tree | 6b7d442ddfaf90ff662c966fad8373a003b905e8 /libavcodec | |
| parent | ac967ad8724ee860085cd108f822b3f830b89767 (diff) | |
| parent | 312daa15891dc7abb77a404fe927d5ee35c52a71 (diff) | |
| download | ffmpeg-a82f3de053a7c398418b92ee048cf1e5e83d417d.tar.gz | |
Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71'
* commit '312daa15891dc7abb77a404fe927d5ee35c52a71':
vp9: Use the correct upper bound for seg_id
Conflicts:
libavcodec/vp9.h
libavcodec/vp9block.c
Not merged, the value was correct before as far as i can see
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vp9.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 7b7deb3aa6..07df9ef75d 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -145,6 +145,7 @@ typedef struct VP9Context { uint8_t yac_qi; int8_t ydc_qdelta, uvdc_qdelta, uvac_qdelta; uint8_t lossless; +#define MAX_SEGMENT 8 struct { uint8_t enabled; uint8_t temporal; @@ -160,7 +161,7 @@ typedef struct VP9Context { int8_t lf_val; int16_t qmul[2][2]; uint8_t lflvl[4][2]; - } feat[8]; + } feat[MAX_SEGMENT]; } segmentation; struct { unsigned log2_tile_cols, log2_tile_rows; |