aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-03-22 16:38:24 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2020-04-05 23:18:55 +0200
commit741565a1e69c45ce4848f01e45be5e66a68efa2f (patch)
tree2ac8dfe7140e06efef576bd704243d0c960f5e61
parent8defd0ca7b4ac6658e6beb9dcdc0183b2d3e53d8 (diff)
downloadffmpeg-741565a1e69c45ce4848f01e45be5e66a68efa2f.tar.gz
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>
-rw-r--r--libavcodec/cbs_h264_syntax_template.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cbs_h264_syntax_template.c b/libavcodec/cbs_h264_syntax_template.c
index 878d348b94..b65460996b 100644
--- a/libavcodec/cbs_h264_syntax_template.c
+++ b/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);
max = (pic_size + pps->slice_group_change_rate_minus1) /
(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);
}