virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-14 00:58:38 +02:00
Code Issues Releases Activity

Merge commit '312daa15891dc7abb77a404fe927d5ee35c52a71'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2014-11-21 23:18:30 +01:00
commit a82f3de053
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/vp9.c
View File

@ -145,6 +145,7 @@ typedef struct VP9Context {
uint8_t yac_qi; uint8_t yac_qi;
int8_t ydc_qdelta, uvdc_qdelta, uvac_qdelta; int8_t ydc_qdelta, uvdc_qdelta, uvac_qdelta;
uint8_t lossless; uint8_t lossless;
#define MAX_SEGMENT 8
struct { struct {
uint8_t enabled; uint8_t enabled;
uint8_t temporal; uint8_t temporal;
@ -160,7 +161,7 @@ typedef struct VP9Context {
int8_t lf_val; int8_t lf_val;
int16_t qmul[2][2]; int16_t qmul[2][2];
uint8_t lflvl[4][2]; uint8_t lflvl[4][2];
} feat[8]; } feat[MAX_SEGMENT];
} segmentation; } segmentation;
struct { struct {
unsigned log2_tile_cols, log2_tile_rows; unsigned log2_tile_cols, log2_tile_rows;