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_syntax_template.c | |
| 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_syntax_template.c')
| -rw-r--r-- | libavcodec/cbs_h264_syntax_template.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c index 267f35ccb7..05370b81fa 100644 --- a/libavcodec/cbs_h264_syntax_template.c +++ b/libavcodec/cbs_h264_syntax_template.c @@ -404,6 +404,9 @@ static int FUNC(pps)(CodedBitstreamContext *ctx, RWContext *rw, ue(slice_group_change_rate_minus1, 0, pic_size - 1); } else if (current->slice_group_map_type == 6) { ue(pic_size_in_map_units_minus1, pic_size - 1, pic_size - 1); + + allocate(current->slice_group_id, + current->pic_size_in_map_units_minus1 + 1); for (i = 0; i <= current->pic_size_in_map_units_minus1; i++) u(av_log2(2 * current->num_slice_groups_minus1 + 1), slice_group_id[i], 0, current->num_slice_groups_minus1); |