PR #20944 opened by Jack Lau (JackLau) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20944 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20944.patch
Fix #20940 This reverts commit 4440e499ba It breaks some filters like feedback, and make li->frame_blocked_in check invaild. Signed-off-by: Jack Lau <[email protected]> >From 9862f4a16c5f36f263a8677fb17b2d68766a969a Mon Sep 17 00:00:00 2001 From: Jack Lau <[email protected]> Date: Mon, 17 Nov 2025 23:55:53 +0800 Subject: [PATCH] Revert " avfilter/avfilter: always forward request frame in filter_activate_default" Fix #20940 This reverts commit 4440e499ba It breaks some filters like feedback, and make li->frame_blocked_in check invaild. Signed-off-by: Jack Lau <[email protected]> --- libavfilter/avfilter.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 169c2baa42..cea2c442f2 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -1290,11 +1290,6 @@ static int filter_activate_default(AVFilterContext *filter) return request_frame_to_filter(filter->outputs[i]); } } - for (i = 0; i < filter->nb_outputs; i++) { - FilterLinkInternal * const li = ff_link_internal(filter->outputs[i]); - if (li->frame_wanted_out) - return request_frame_to_filter(filter->outputs[i]); - } if (!filter->nb_outputs) { ff_inlink_request_frame(filter->inputs[0]); return 0; @@ -1433,12 +1428,6 @@ static int filter_activate_default(AVFilterContext *filter) repeatedly on a blocked input if another is not blocked (example: [buffersrc1][testsrc1][buffersrc2][testsrc2]concat=v=2). - - If an output has frame_wanted_out > 0 call request_frame(). - - Rationale: even if all inputs are blocked an activate callback should - request a frame on some if its inputs if a frame is requested on any of - its output. - - Request a frame on the input for sinks. Rationale: sinks using the old api have no way to request a frame on their -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
