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

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

commit 2d32a6611a5a9e540d7e2b9bad14c73ceeb8c0a6
Author:     Haihao Xiang <[email protected]>
AuthorDate: Mon Apr 22 14:57:08 2024 +0800
Commit:     James Almer <[email protected]>
CommitDate: Fri Jan 2 21:58:51 2026 +0000

    lavc/vp9: Fix regression introduced in 0ba05857
    
    It is possible that ff_progress_frame_await() is called but
    ff_progress_frame_report() isn't called when a hardware acceleration
    method is used, so a thread for vp9 decoding might get stuck.
    
    Backport comment: in 7.1 there was a switch to ProgressFrames
    (7bd3b737163), so there was the need to convert the calls back to
    ThreadFrames calls. In this case, it was just moving the progress
    report function inside the finish label.
    
    Reviewed-by: Andreas Rheinhardt <[email protected]>
    Signed-off-by: Haihao Xiang <[email protected]>
    (cherry picked from commit 8c62d77139ca07390414fcfd26b2a4d506fed3b9)
    Signed-off-by: Carlos Henrique Lima Melara <[email protected]>
---
 libavcodec/vp9.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c
index bc58d647ab..3ea02e0773 100644
--- a/libavcodec/vp9.c
+++ b/libavcodec/vp9.c
@@ -1761,9 +1761,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
         if (ret < 0)
             goto fail;
     }
-    ff_thread_report_progress(&s->s.frames[CUR_FRAME].tf, INT_MAX, 0);
 
 finish:
+    ff_thread_report_progress(&s->s.frames[CUR_FRAME].tf, INT_MAX, 0);
     // ref frame setup
     for (i = 0; i < 8; i++) {
         if (s->s.refs[i].f->buf[0])

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

Reply via email to