virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

lavc/vvc: Fix condition for using default scaling factor

Browse Source 
Add handling here for
sps_scaling_matrix_for_alternative_colour_space_disabled_flag.

Also add parentheses to make behaviour a little more explicit,
where &&'s precedence over || was relied on previously.

Reported-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Frank Plowman <post@frankplowman.com>
This commit is contained in:
Frank Plowman
2025-06-21 13:05:14 +01:00
parent f8a9d9473b
commit 540a2497d2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/vvc/intra.c
View File

@ -367,10 +367,10 @@ static const uint8_t* derive_scale_m(const VVCLocalContext *lc, const TransformB
const int log2_matrix_size = (id < 2) ? 1 : (id < 8) ? 2 : 3;
uint8_t *p = scale_m;
av_assert0(!sps->r->sps_scaling_matrix_for_alternative_colour_space_disabled_flag);
if (!rsh->sh_explicit_scaling_list_used_flag || tb->ts ||
sps->r->sps_scaling_matrix_for_lfnst_disabled_flag && cu->apply_lfnst_flag[tb->c_idx])
(sps->r->sps_scaling_matrix_for_lfnst_disabled_flag && cu->apply_lfnst_flag[tb->c_idx]) ||
(sps->r->sps_scaling_matrix_for_alternative_colour_space_disabled_flag &&
sps->r->sps_scaling_matrix_designated_colour_space_flag == cu->act_enabled_flag))
return ff_vvc_default_scale_m;
if (!sl) {