From patchwork Thu Jun 16 19:55:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 36278 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp1128998pzb; Thu, 16 Jun 2022 13:07:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tuSiu+VoJKZ7PaMdZ8fdH8YqLzxM7PWGnkfCQtDXi3j3wT9eAV6wss6+xPnv0MNocBDq8j X-Received: by 2002:a17:907:6e9f:b0:711:d2cb:63d8 with SMTP id sh31-20020a1709076e9f00b00711d2cb63d8mr5948776ejc.232.1655410021778; Thu, 16 Jun 2022 13:07:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655410021; cv=none; d=google.com; s=arc-20160816; b=wjzO9nfduZ+HmzEayFRfYgX9z4FHipzxJYaDZCqUl6esaAYKXeqxPOq9OsyUEILFIz ybE06VJoZ7DSS8FkJnQc+U2ehJTgMyv/Pfy6qhLEdpNq3kef6pGOJTXsCMg0UnxZfbRC Pre32l1VEDdeVFHZf/2nvU7CoyT5vq4MSDEYxp5NOaXzgC0s23WfgHAwXPvMP5oFw8BH QPZWpBE9Lpcz/1nao7m8XobF8JrxONrXTlUKAIjbUwAFFoeHH2CgRgPG+1Yhe/Yhlkqa 7CDPSFp98iHPBnw8/7WLaErGa2U+kosq/3Y17eGP6fdm5dwZqY1dzAp9Kr1rTTMjMsg3 PhEw== 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:delivered-to; bh=BrTb6N4W1rVXGzYKgWS6NgEl3oqF92Zl4iskb7lp1u0=; b=ZKFuDMGBCyUVfdjnHIwsMkLodCgohjT8UAmWAEv+dylu2KkfZemir5RJHVhGcxOl8m 6wseeLROrDO76GUAn14Y/EEtQvY0DFn3NOHlBgt8EQSL+AjvoNdKWy9E3OAJVCY9sNdz hVFVE2sxG0HbkmxIoGQQ0PduyYuhO86Ik02eZY4BFo4901nTptj84PQOam8/1GH4LVOS 2582Zt/UmHgUbgZNtXzFKdv5Hzvf1X3I54xJAUoz/Bcqahzk4nyxnESufj+Z9gpEoK0V /DcLoGOmoQLY487GwVpu16ditua0R83ydeMim9/0zyuQOjgkWuoPrbXW8w1pYrxKz8R2 Q6Xw== ARC-Authentication-Results: i=1; mx.google.com; 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 m10-20020a056402510a00b0042bcbb48fe4si3966163edd.240.2022.06.16.13.07.01; Thu, 16 Jun 2022 13:07:01 -0700 (PDT) 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; 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 6066468B8C0; Thu, 16 Jun 2022 23:04:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8FC4B68B84F for ; Thu, 16 Jun 2022 23:03:41 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 6EC91240555 for ; Thu, 16 Jun 2022 22:03:39 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id POXSqQeAW9x8 for ; Thu, 16 Jun 2022 22:03:38 +0200 (CEST) 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 mail0.khirnov.net (Postfix) with ESMTPS id D7EC9240512 for ; Thu, 16 Jun 2022 22:03:33 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id C2A583A20D5; Thu, 16 Jun 2022 22:03:30 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Jun 2022 21:55:16 +0200 Message-Id: <20220616195534.5278-17-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220616195534.5278-1-anton@khirnov.net> References: <20220616195534.5278-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 17/35] fftools/ffmpeg: do not send spurious EOF for streamcopy when looping 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: LCIY9oqHLuu7 --- fftools/ffmpeg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index b8a11818b8..53ca8c7f7b 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2516,7 +2516,8 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo for (i = 0; i < nb_output_streams; i++) { OutputStream *ost = output_streams[i]; - if (!check_output_constraints(ist, ost) || ost->encoding_needed) + if (!check_output_constraints(ist, ost) || ost->encoding_needed || + (!pkt && no_eof)) continue; do_streamcopy(ist, ost, pkt);