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 B359346583 for ; Fri, 21 Jul 2023 12:06:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE69368C5A2; Fri, 21 Jul 2023 15:06:43 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6228F68C3A4 for ; Fri, 21 Jul 2023 15:06:38 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 184E72404EC for ; Fri, 21 Jul 2023 14:06:38 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id YbQ1eMl16HB0 for ; Fri, 21 Jul 2023 14:06:37 +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 9B74C2404EA for ; Fri, 21 Jul 2023 14:06:37 +0200 (CEST) Received: by lain.khirnov.net (Postfix, from userid 1000) id 88A1B1601B2; Fri, 21 Jul 2023 14:06:37 +0200 (CEST) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: <68189993-832b-3442-6681-fab13a4d2243@passwd.hu> References: <20230715104611.17902-1-anton@khirnov.net> <20230715104611.17902-46-anton@khirnov.net> <68189993-832b-3442-6681-fab13a4d2243@passwd.hu> Mail-Followup-To: FFmpeg development discussions and patches Date: Fri, 21 Jul 2023 14:06:37 +0200 Message-ID: <168994119751.27367.7698842225017050971@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 46/47] fftools/ffprobe: stop calling exit_program() 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: Quoting Marton Balint (2023-07-20 22:35:23) > > > On Sat, 15 Jul 2023, Anton Khirnov wrote: > > > Inline the relevant part of ffprobe_cleanup() into main() and drop the > > rest. > > --- > > fftools/ffprobe.c | 22 ++++++++-------------- > > 1 file changed, 8 insertions(+), 14 deletions(-) > > > > diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c > > index e234c92904..a39185f6fe 100644 > > --- a/fftools/ffprobe.c > > +++ b/fftools/ffprobe.c > > @@ -381,17 +381,6 @@ static void log_callback(void *ptr, int level, const char *fmt, va_list vl) > > #endif > > } > > > > > [...] > > > @@ -4124,8 +4112,10 @@ int main(int argc, char **argv) > > > > show_banner(argc, argv, options); > > ret = parse_options(NULL, argc, argv, options, opt_input_file); > > - if (ret < 0) > > - exit_program(ret == AVERROR_EXIT ? 0 : 1); > > + if (ret < 0) { > > + ret = AVERROR_EXIT ? 0 : ret; > > This looks unintended. Which part of it and why? -- 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".