From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DCB4E49371 for ; Sat, 9 Mar 2024 19:01:54 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4E9D68CD3F; Sat, 9 Mar 2024 21:01:44 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDBD668CC8B for ; Sat, 9 Mar 2024 21:01:36 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=CGjPa7yR; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id A36F74D46 for ; Sat, 9 Mar 2024 20:01:34 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id od1uCwUzGsN0 for ; Sat, 9 Mar 2024 20:01:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1710010893; bh=YiPByO5GNMjoA9Q8Om87Z/GY/VduWnI6EKEQNkiF4Ko=; h=From:To:Subject:Date:In-Reply-To:References:From; b=CGjPa7yRfYt44fZIlWdN+4FB65c2GK1Ah4UsK+ic1D+TxIfzcKSrVHO7NJwRKoX/h YM7ZCnWlYGiVWVdnM1P7Ns3RTbJY1nvxGshZLHiI/Dfr+P7wBO+pgMhFf7p7GgVaA0 3QXDdIPt6VBUrKxFtF5XNCAvUZr4q6CVwXgQqUfJn5LwzM7K4SFLVAu/nBTRbUqKjD hLJHDLZnJ2ik6UM24pjoIGQ9RP3flBQi0uwfMPIfvJ8chuRQQUnSkgph+2QX3M7oIz 0CSxfX9S4vCJxamhyk+6lkokqJrZZpm8L7Ge5I7QXXtqUA98lMWgJYAMKCqvxFvTeq PQD0gXeuOOOPw== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id 79C204482 for ; Sat, 9 Mar 2024 20:01:33 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 472343A0582 for ; Sat, 9 Mar 2024 20:01:26 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Mar 2024 20:01:23 +0100 Message-ID: <20240309190123.8110-2-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240309190123.8110-1-anton@khirnov.net> References: <20240309190123.8110-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] fftools/ffmpeg_filter: merge block with the enclosing one 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 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: It has no reason to exist. --- fftools/ffmpeg_filter.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 7cd5415341..a87bed6ec7 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -2251,19 +2251,17 @@ static int fg_output_frame(OutputFilterPriv *ofp, FilterGraphThread *fgt, frame_out = frame; } - { - // send the frame to consumers - ret = sch_filter_send(fgp->sch, fgp->sch_idx, ofp->index, frame_out); - if (ret < 0) { - av_frame_unref(frame_out); + // send the frame to consumers + ret = sch_filter_send(fgp->sch, fgp->sch_idx, ofp->index, frame_out); + if (ret < 0) { + av_frame_unref(frame_out); - if (!fgt->eof_out[ofp->index]) { - fgt->eof_out[ofp->index] = 1; - fgp->nb_outputs_done++; - } - - return ret == AVERROR_EOF ? 0 : ret; + if (!fgt->eof_out[ofp->index]) { + fgt->eof_out[ofp->index] = 1; + fgp->nb_outputs_done++; } + + return ret == AVERROR_EOF ? 0 : ret; } if (type == AVMEDIA_TYPE_VIDEO) { -- 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".