From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1CF344BC8C for ; Wed, 23 Jul 2025 23:36:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 2F53168D392; Thu, 24 Jul 2025 02:36:20 +0300 (EEST) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DDD6968CCFA for ; Thu, 24 Jul 2025 02:36:11 +0300 (EEST) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 2D827EBA8A; Thu, 24 Jul 2025 01:33:48 +0200 (CEST) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mcBjl32p45EL; Thu, 24 Jul 2025 01:33:46 +0200 (CEST) Received: from bluegene.passwd.hu (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 32FE5EBA7C; Thu, 24 Jul 2025 01:33:45 +0200 (CEST) From: Marton Balint To: ffmpeg-devel@ffmpeg.org Date: Thu, 24 Jul 2025 01:35:59 +0200 Message-ID: <20250723233604.29380-3-cus@passwd.hu> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250723233604.29380-1-cus@passwd.hu> References: <20250723233604.29380-1-cus@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avfilter/af_afade: fix check_input for empty streams X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Marton Balint Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Use ff_outlink_get_status directly to get pending EOF state. Fixes assertion failure with: ffmpeg -lavfi "sine=f=1000:d=2[a];sine=f=440:d=2,atrim=end=0[b];[a][b]acrossfade=d=1" -f framecrc - ffmpeg -lavfi "sine=f=1000:d=2,atrim=end=0[a];sine=f=440:d=2[b];[a][b]acrossfade=d=1" -f framecrc - Signed-off-by: Marton Balint --- libavfilter/af_afade.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_afade.c b/libavfilter/af_afade.c index b006420111..baf972d17d 100644 --- a/libavfilter/af_afade.c +++ b/libavfilter/af_afade.c @@ -541,13 +541,6 @@ CROSSFADE(flt, float) CROSSFADE(s16, int16_t) CROSSFADE(s32, int32_t) -static int check_input(AVFilterLink *inlink) -{ - const int queued_samples = ff_inlink_queued_samples(inlink); - - return ff_inlink_check_available_samples(inlink, queued_samples + 1) == 1; -} - static int pass_frame(AVFilterLink *inlink, AVFilterLink *outlink, int64_t *pts) { AVFrame *in; @@ -675,10 +668,10 @@ static int activate(AVFilterContext *ctx) ff_inlink_queued_samples(ctx->inputs[1]) >= s->nb_samples) { return pass_crossfade(ctx); } else if (ff_outlink_frame_wanted(outlink)) { - if (!s->status[0] && check_input(ctx->inputs[0])) + if (!s->status[0] && ff_outlink_get_status(ctx->inputs[0])) s->status[0] = AVERROR_EOF; s->passthrough = !s->status[0]; - if (check_input(ctx->inputs[1])) { + if (ff_outlink_get_status(ctx->inputs[1])) { s->status[1] = AVERROR_EOF; ff_outlink_set_status(outlink, AVERROR_EOF, AV_NOPTS_VALUE); return 0; -- 2.43.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".