avfilter/vf_decimate: also check for ready frames if not ppsrc is used

Fixes filtering when cascading multiple decimate filters.

Paul B Mahol committed 4 years ago

Commit 19614921 parent d794b361 file · +2 −2Browse files

Unified · Split

@@ -289,8 +289,8 @@ static int activate(AVFilterContext *ctx) · 288 unmodified lines
289	289	}
290	290	}
291	291
292		− if (ff_inlink_queued_frames(ctx->inputs[INPUT_MAIN]) > 0 &&
293		− (dm->ppsrc && ff_inlink_queued_frames(ctx->inputs[INPUT_CLEANSRC]) > 0)) {
	292	+ if (ff_inlink_queued_frames(ctx->inputs[INPUT_MAIN]) > 0 && (!dm->ppsrc \|\|
	293	+ (dm->ppsrc && ff_inlink_queued_frames(ctx->inputs[INPUT_CLEANSRC]) > 0))) {
294	294	ff_filter_set_ready(ctx, 100);
295	295	} else if (ff_outlink_frame_wanted(ctx->outputs[0])) {
296	296	if (dm->got_frame[INPUT_MAIN] == 0)

Keyboard shortcuts