From patchwork Sat Mar 9 19:01:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 46919 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dc95:b0:1a1:738b:6bc0 with SMTP id ky21csp390187pzb; Sat, 9 Mar 2024 11:01:57 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWrkad6wbYQ+illHXMCCo5nNgroWIq97/FLAZB/dYkwAvbq0dV0Vc5rPJlMFmZZLtD46lNJ/RqrElUBXh2dxPPRVRyXRTvxAckTBA== X-Google-Smtp-Source: AGHT+IG01PdR3jhYRIhD5l7bRh6CHCf2vD3+z9K7H7Qkblu1fWHHCbwchufjVeIp1LATprtEc6J1 X-Received: by 2002:a50:a694:0:b0:565:471b:c047 with SMTP id e20-20020a50a694000000b00565471bc047mr1969395edc.0.1710010917494; Sat, 09 Mar 2024 11:01:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1710010917; cv=none; d=google.com; s=arc-20160816; b=aYtMFTGrn/N9Q2EUyp9jUU17zzEdNbSai357hZQSS1ZjDFH/S2sKuh0eGb1e/gqvo+ uv6FrTGN9w0PERCnyn5FOAQvnEW8+u1+cToDoJcYDA9YVCFwwXsCttnjgP+YpWpbvVAV UDCt8ramRgyzv4OQx41BjGCLFyU3hcPtTj+LKQAwlk5qWAjnmZLBXxFfFKENUspilKK7 FwoOg2MGZzKLxNG6QXUqg4T0mSunpurJKu6mzobvjD8DjbKZ8hf6JTFFVQVMha/Sizox D1OHzDgx3IxK+JY4PqLoIJX14NKptCluVWGtEUg89jFqcG3awY40GNkjiF9J8t//nOOa +ByA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=e0+8CiiujWcIPRUiz58CNJZ4EIOenEmvaYKi0yvyziA=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=SqWOyEbUU17R4yESGOpKwPlCnYCBV8Y+9E2V8vw2R26cs+sxYdEb21Q7M/mXI7cBsU UH1Lhk66xXyEIT/2+4GWi8VjOFmgdAdjhRfD+3s93B0ByEABM2BFYBoDLQ6OHgdKT6XR owYfOry2RWt3Ttu34bWHSVHYi5HFdcBBa9CXaO6lCfxkh2ytDF6pY9LSLqXBqn1bf2B3 ZmfGc1Iqb6FMxAgPGm2JJ+927y9ITz3JvjWbAWp68Aqgohy/vhL+LnUBSCX6VRTJNhFd 8e6HOfjGREtXrrf3bN5LL5e0cYuL8SCm8PhjfR/6Lp4oTIcjMrqiaNbs9oPuybj2e3dr mgrA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=CGjPa7yR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h8-20020a056402094800b005671805d516si936637edz.526.2024.03.09.11.01.57; Sat, 09 Mar 2024 11:01:57 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=CGjPa7yR; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1F85168CD43; Sat, 9 Mar 2024 21:01:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: trwq47zGKNjh 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) {