avcodec/cbs_h264_syntax_template: fix off by 1 error with slice_group_change_cycle

Fixes: assertion failure
Fixes: 20390/clusterfuzz-testcase-minimized-ffmpeg_BSF_H264_REDUNDANT_PPS_fuzzer-5683400772157440

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
pull/336/head
Michael Niedermayer 5 years ago
parent 8defd0ca7b
commit 741565a1e6
  1. 2
      libavcodec/cbs_h264_syntax_template.c

@ -1366,7 +1366,7 @@ static int FUNC(slice_header)(CodedBitstreamContext *ctx, RWContext *rw,
(sps->pic_height_in_map_units_minus1 + 1); (sps->pic_height_in_map_units_minus1 + 1);
max = (pic_size + pps->slice_group_change_rate_minus1) / max = (pic_size + pps->slice_group_change_rate_minus1) /
(pps->slice_group_change_rate_minus1 + 1); (pps->slice_group_change_rate_minus1 + 1);
bits = av_log2(2 * max - 1); bits = av_ceil_log2(max + 1);
u(bits, slice_group_change_cycle, 0, max); u(bits, slice_group_change_cycle, 0, max);
} }

Loading…
Cancel
Save