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 EC5F946034 for ; Wed, 31 May 2023 14:57:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E1D0168C2FE; Wed, 31 May 2023 17:55:30 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9D37A68C2A3 for ; Wed, 31 May 2023 17:55:12 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3207C2405F9 for ; Wed, 31 May 2023 16:55:09 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id VKg5DVGXtzzn for ; Wed, 31 May 2023 16:55:08 +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 D26AB2406CA for ; Wed, 31 May 2023 16:55:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 98A353A0CE0 for ; Wed, 31 May 2023 16:55:00 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 31 May 2023 16:54:48 +0200 Message-Id: <20230531145453.20994-18-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531145453.20994-1-anton@khirnov.net> References: <20230531145453.20994-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 18/23] fftools/ffmpeg: simplify handling input -t for streamcopy 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: Output stream will be closed implicitly after a NULL packet is sent to it, there is no need to explicitly call close_output_stream(). --- fftools/ffmpeg.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 9997881572..7d2a25f2bf 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -785,7 +785,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo int64_t dts_est = AV_NOPTS_VALUE; int ret = 0; int eof_reached = 0; - int duration_exceeded; if (ist->decoding_needed) ret = dec_packet(ist, pkt, no_eof); @@ -797,7 +796,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo dts_est = pd->dts_est; } - duration_exceeded = 0; if (f->recording_time != INT64_MAX) { int64_t start_time = 0; if (copy_ts) { @@ -805,7 +803,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo start_time += start_at_zero ? 0 : f->start_time_effective; } if (dts_est >= f->recording_time + start_time) - duration_exceeded = 1; + pkt = NULL; } for (int oidx = 0; oidx < ist->nb_outputs; oidx++) { @@ -813,11 +811,6 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo if (ost->enc || (!pkt && no_eof)) continue; - if (duration_exceeded) { - close_output_stream(ost); - continue; - } - of_streamcopy(ost, pkt, dts_est); } -- 2.40.1 _______________________________________________ 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".