RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/cbs_h266: fix use of uninitialized value 

And fix the allowed range for ph_log2_diff_max_bt_min_qt_intra_slice_luma while at it.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-07-06 12:04:50 -03:00
parent 7eeef72c67
commit 0f008a0ffa
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/cbs_h266_syntax_template.c
View File

@ -2731,8 +2731,13 @@ static int FUNC(picture_header) (CodedBitstreamContext *ctx, RWContext *rw,
ue(ph_max_mtt_hierarchy_depth_intra_slice_luma,
0, 2 * (ctb_log2_size_y - min_cb_log2_size_y));
if (current->ph_max_mtt_hierarchy_depth_intra_slice_luma != 0) {
min_qt_log2_size_intra_y =
current->ph_log2_diff_min_qt_min_cb_intra_slice_luma +
min_cb_log2_size_y;
ue(ph_log2_diff_max_bt_min_qt_intra_slice_luma,
0, ctb_log2_size_y - min_qt_log2_size_intra_y);
0, (sps->sps_qtbtt_dual_tree_intra_flag ?
FFMIN(6, ctb_log2_size_y) :
ctb_log2_size_y) - min_qt_log2_size_intra_y);
ue(ph_log2_diff_max_tt_min_qt_intra_slice_luma,
0, FFMIN(6, ctb_log2_size_y) - min_qt_log2_size_intra_y);
} else {