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 4FA5B45748 for ; Sat, 22 Apr 2023 15:44:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E072F68BF7A; Sat, 22 Apr 2023 18:44:14 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A20868BF2F for ; Sat, 22 Apr 2023 18:44:09 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 38AB92404EE; Sat, 22 Apr 2023 17:44:09 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id YNG25rLiJS3S; Sat, 22 Apr 2023 17:44:08 +0200 (CEST) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (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 "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id AC31D2404EC; Sat, 22 Apr 2023 17:44:08 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 8FC931601B2; Sat, 22 Apr 2023 17:44:08 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: Mail-Followup-To: FFmpeg development discussions and patches , Zhao Zhili Date: Sat, 22 Apr 2023 17:44:08 +0200 Message-ID: <168217824856.3843.12078608174603704828@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH v2] fftools/ffmpeg_mux: fix reporting muxer EOF as error 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: Zhao Zhili 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: Quoting Zhao Zhili (2023-04-22 14:56:34) > From: Zhao Zhili > > Fix #10327. > > Signed-off-by: Zhao Zhili > --- > fftools/ffmpeg_mux.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c > index a2e8873ad2..0e1a5d7dc5 100644 > --- a/fftools/ffmpeg_mux.c > +++ b/fftools/ffmpeg_mux.c > @@ -214,9 +214,15 @@ static void *muxer_thread(void *arg) > ost = of->streams[stream_idx]; > ret = sync_queue_process(mux, ost, ret < 0 ? NULL : pkt, &stream_eof); > av_packet_unref(pkt); > - if (ret == AVERROR_EOF && stream_eof) > - tq_receive_finish(mux->tq, stream_idx); > - else if (ret < 0) { > + if (ret == AVERROR_EOF) { > + if (stream_eof) { > + tq_receive_finish(mux->tq, stream_idx); > + } else { > + av_log(mux, AV_LOG_VERBOSE, "Muxer %s\n", av_err2str(ret)); That seems unnecesarily convoluted, given that we _know_ the error to be EOF here. Also, please make it "Muxer returned EOF" to make it clear what exactly is the source of EOF. Otherwise ok, feel free to push with this change. Thanks. -- Anton Khirnov _______________________________________________ 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".