diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 22:28:46 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-03-21 11:27:13 +0100 |
| commit | e7226984ac13aacb84eae77a372df8ff7685848f (patch) | |
| tree | 57ef86e9247fbf9abc8ffea1c830f75df509014b /libavcodec/h264.h | |
| parent | 30da98adbda6de1f55188f9058a3a5c715049633 (diff) | |
| download | ffmpeg-e7226984ac13aacb84eae77a372df8ff7685848f.tar.gz | |
h264: move [{top,left}_]cbp into the per-slice context
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 e998eb6cc3..e08e5baf85 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -359,6 +359,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]; @@ -484,9 +488,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; |