This is an automated email from the git hooks/post-receive script.

Git pushed a commit to branch release/7.1
in repository ffmpeg.

commit efd787107e4bf84523b09826db61e1a5e1728450
Author:     Chris Warrington <[email protected]>
AuthorDate: Mon Dec 2 14:27:12 2024 +0000
Commit:     Frank Plowman <[email protected]>
CommitDate: Wed Jun 10 15:12:21 2026 +0100

    avcodec/vvc decode: ALF filtering without CC-ALF
    
    When a stream has ALF filtering enabled but not CC-ALF, the CC-ALF set 
indexes alf->ctb_cc_idc are being read uninitialized during ALF filtering.
    
    This change initializes alf->ctb_cc_idc whenever ALF is enabled.
    
    Ref. https://trac.ffmpeg.org/ticket/11325
    
    (cherry picked from commit f80af3657f162ba79b872bc27ae06d75560d58a9)
---
 libavcodec/vvc/ctu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vvc/ctu.c b/libavcodec/vvc/ctu.c
index 634c553814..764de25761 100644
--- a/libavcodec/vvc/ctu.c
+++ b/libavcodec/vvc/ctu.c
@@ -2289,6 +2289,7 @@ static void alf_params(VVCLocalContext *lc, const int rx, 
const int ry)
     ALFParams *alf                = &CTB(fc->tab.alf, rx, ry);
 
     alf->ctb_flag[LUMA] = alf->ctb_flag[CB] = alf->ctb_flag[CR] = 0;
+    alf->ctb_cc_idc[0] = alf->ctb_cc_idc[1] = 0;
     if (sh->sh_alf_enabled_flag) {
         alf->ctb_flag[LUMA] = ff_vvc_alf_ctb_flag(lc, rx, ry, LUMA);
         if (alf->ctb_flag[LUMA]) {
@@ -2319,7 +2320,6 @@ static void alf_params(VVCLocalContext *lc, const int rx, 
const int ry)
         const uint8_t cc_enabled[] = { sh->sh_alf_cc_cb_enabled_flag, 
sh->sh_alf_cc_cr_enabled_flag };
         const uint8_t cc_aps_id[]  = { sh->sh_alf_cc_cb_aps_id, 
sh->sh_alf_cc_cr_aps_id };
         for (int i = 0; i < 2; i++) {
-            alf->ctb_cc_idc[i] = 0;
             if (cc_enabled[i]) {
                 const VVCALF *aps = fc->ps.alf_list[cc_aps_id[i]];
                 alf->ctb_cc_idc[i] = ff_vvc_alf_ctb_cc_idc(lc, rx, ry, i, 
aps->num_cc_filters[i]);

_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to