diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:46:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-21 15:48:13 +0100 |
| commit | 4c5c913dd8d946022ba160ec480694222aab061d (patch) | |
| tree | 9a334723d85f05425e9d43bad3f18d1435d96f36 /libavcodec/h264.h | |
| parent | f5d4d618242f412626f65e5f9b5a069448bf219b (diff) | |
| parent | e7226984ac13aacb84eae77a372df8ff7685848f (diff) | |
| download | ffmpeg-4c5c913dd8d946022ba160ec480694222aab061d.tar.gz | |
Merge commit 'e7226984ac13aacb84eae77a372df8ff7685848f'
* commit 'e7226984ac13aacb84eae77a372df8ff7685848f':
h264: move [{top,left}_]cbp into the per-slice context
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.h')
| -rw-r--r-- | libavcodec/h264.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h index 4b3bf97d61..d43713de6e 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -396,6 +396,10 @@ typedef struct H264SliceContext { int col_parity; int col_fieldoff; + int cbp; + int top_cbp; + int left_cbp; + int dist_scale_factor[32]; int dist_scale_factor_field[2][32]; int map_col_to_list0[2][16 + 32]; @@ -527,9 +531,7 @@ typedef struct H264Context { /* 0x100 -> non null luma_dc, 0x80/0x40 -> non null chroma_dc (cb/cr), 0x?0 -> chroma_cbp(0, 1, 2), 0x0? luma_cbp */ uint16_t *cbp_table; - int cbp; - int top_cbp; - int left_cbp; + /* chroma_pred_mode for i4x4 or i16x16, else 0 */ uint8_t *chroma_pred_mode_table; int last_qscale_diff; |