diff options
| author | Mark Thompson <sw@jkqxz.net> | 2018-02-21 22:41:00 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2018-02-21 22:41:00 +0000 |
| commit | ab6edb173b365d9a787c2df3a45e3a018d7843d7 (patch) | |
| tree | be0599167db492596c55418f0b2e841b50efab7d /libavcodec/cbs_h264.h | |
| parent | 7386b4ff39506b7a34b3689cc4b05993ed9b4a4f (diff) | |
| parent | 7157d959264f3729da463725c6faa580d9394d19 (diff) | |
Merge commit '7157d959264f3729da463725c6faa580d9394d19'
* commit '7157d959264f3729da463725c6faa580d9394d19':
cbs_h264: Move slice_group_id array out of PPS structure
Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/cbs_h264.h')
| -rw-r--r-- | libavcodec/cbs_h264.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/cbs_h264.h b/libavcodec/cbs_h264.h index ae39fc7040..11dce87103 100644 --- a/libavcodec/cbs_h264.h +++ b/libavcodec/cbs_h264.h @@ -195,7 +195,9 @@ typedef struct H264RawPPS { uint8_t slice_group_change_direction_flag; uint16_t slice_group_change_rate_minus1; uint16_t pic_size_in_map_units_minus1; - uint8_t slice_group_id[H264_MAX_MB_PIC_SIZE]; + + uint8_t *slice_group_id; + AVBufferRef *slice_group_id_ref; uint8_t num_ref_idx_l0_default_active_minus1; uint8_t num_ref_idx_l1_default_active_minus1; |