From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTP id 025CA4682F
	for <ffmpegdev@gitmailbox.com>; Thu, 20 Jul 2023 20:38:40 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 10B1168C3DA;
	Thu, 20 Jul 2023 23:38:38 +0300 (EEST)
Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0158568C171
 for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Jul 2023 23:38:30 +0300 (EEST)
Received: from localhost (localhost [127.0.0.1])
 by iq.passwd.hu (Postfix) with ESMTP id B7AC6E91AC
 for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Jul 2023 22:35:30 +0200 (CEST)
X-Virus-Scanned: amavisd-new at passwd.hu
Received: from iq.passwd.hu ([127.0.0.1])
 by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024)
 with ESMTP id rdnxW6HlMbYa for <ffmpeg-devel@ffmpeg.org>;
 Thu, 20 Jul 2023 22:35:23 +0200 (CEST)
Received: from iq (iq [217.27.212.140])
 by iq.passwd.hu (Postfix) with ESMTPS id 672F3E91AA
 for <ffmpeg-devel@ffmpeg.org>; Thu, 20 Jul 2023 22:35:23 +0200 (CEST)
Date: Thu, 20 Jul 2023 22:35:23 +0200 (CEST)
From: Marton Balint <cus@passwd.hu>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
In-Reply-To: <20230715104611.17902-46-anton@khirnov.net>
Message-ID: <68189993-832b-3442-6681-fab13a4d2243@passwd.hu>
References: <20230715104611.17902-1-anton@khirnov.net>
 <20230715104611.17902-46-anton@khirnov.net>
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 <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/68189993-832b-3442-6681-fab13a4d2243@passwd.hu/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>



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.

Regards,
Marton
_______________________________________________
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".