From patchwork Sat Jul 15 10:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42713 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6da1:b0:131:a7d0:bc6d with SMTP id gl33csp4239956pzb; Sat, 15 Jul 2023 03:49:32 -0700 (PDT) X-Google-Smtp-Source: APBJJlGL4yCO1V5GoWQjlHPgAVucy8dfRFCzPNELiQg/V2bzz7bLTnkDTHBOeKVE95e1/rS8tCHl X-Received: by 2002:a17:906:3f5c:b0:98e:b48:24fc with SMTP id f28-20020a1709063f5c00b0098e0b4824fcmr6065042ejj.51.1689418172646; Sat, 15 Jul 2023 03:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689418172; cv=none; d=google.com; s=arc-20160816; b=Up2/25I4iZDx7szbo9wMv3vti7/5iXv0RVok12uj5FtjgK/0i+Nvbetisvsl7cBGVJ vtO7DCOsWDkhsb4w7qpYM7zUsoGA6DNhaCa8PFqBXx0P4VSo85xtqlSLGJHCA1TSyQ1b J9h2/M/WA9SbWjaBu02KidaR7+YOV3oUo0g2mT11OGNBqrE6WEm0Af+Xdxr9uPAKRvzj IUGOil2t261CqZNZyzxTmHOMquvTmjLqueyDRD/e4FDP6DCXZ3r6vvgEFNthPoOdzxqv 4N3I1vEWEkobc4yRf0bIUDl6bzlD0VM+jO4Buu1Wi78KJCRlefo6Sy/YzOzQdPmdCSKg 0Fbw== 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=1opk777aiQ1IgF0c1iWjkjsYmZafEqJsH3+p7TrhVd0=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=SkQViInwXSU5v/BoK96DtK2xpFPUYm5WMz3Q09u+3YRkpVYp/I8Rlq/JQjdOgmxJ8G G5oDQIjGjqSc4smncENoOFc8zc1ycA02T/yzjMDwhRzlcjgyNAmQrKqpJJvKNPerAnBi L9hB6XFNV1j9ionkNwDx5LwfsmWqk5K+whhPwQSriqA6RQXo+3De0mR0PZ0fBr3Bhv1u +5yt7bX5p9Q1jMU8knz6bTB6mI76q1Iiv4HpPSgSyRdJ3pRPtNEzOCeVJZpRoHVP/QnR 7IkTWSw5LncBpB8Aw/q3J3D0dw7D0JN7scoCRjJ2DubgtIDzDnJZtS7XwNDanuAglIZL JivQ== 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 us12-20020a170906bfcc00b00992ee70a0afsi9985292ejb.12.2023.07.15.03.49.32; Sat, 15 Jul 2023 03:49:32 -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 F2B8468C713; Sat, 15 Jul 2023 13:46:55 +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 5871168C680 for ; Sat, 15 Jul 2023 13:46:40 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 231BA2404EA for ; Sat, 15 Jul 2023 12:46:40 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 3MTLqBxZ6XCb for ; Sat, 15 Jul 2023 12:46:39 +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 1490E240D27 for ; Sat, 15 Jul 2023 12:46:27 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id AB0CA3A2788 for ; Sat, 15 Jul 2023 12:46:21 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 15 Jul 2023 12:46:01 +0200 Message-Id: <20230715104611.17902-37-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230715104611.17902-1-anton@khirnov.net> References: <20230715104611.17902-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 37/47] fftools/ffmpeg_opt: consolidate printing errors in ffmpeg_parse_options() 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: zBfiQObPZLWK --- fftools/ffmpeg_opt.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 44a6b49ed7..14b292f202 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1289,6 +1289,7 @@ static int open_files(OptionGroupList *l, const char *inout, int ffmpeg_parse_options(int argc, char **argv) { OptionParseContext octx; + const char *errmsg = NULL; int ret; memset(&octx, 0, sizeof(octx)); @@ -1297,14 +1298,14 @@ int ffmpeg_parse_options(int argc, char **argv) ret = split_commandline(&octx, argc, argv, options, groups, FF_ARRAY_ELEMS(groups)); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error splitting the argument list: "); + errmsg = "splitting the argument list"; goto fail; } /* apply global options */ ret = parse_optgroup(NULL, &octx.global_opts); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error parsing global options: "); + errmsg = "parsing global options"; goto fail; } @@ -1314,21 +1315,21 @@ int ffmpeg_parse_options(int argc, char **argv) /* open input files */ ret = open_files(&octx.groups[GROUP_INFILE], "input", ifile_open); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error opening input files: "); + errmsg = "opening input files"; goto fail; } /* create the complex filtergraphs */ ret = init_complex_filters(); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error initializing complex filters.\n"); + errmsg = "initializing complex filters"; goto fail; } /* open output files */ ret = open_files(&octx.groups[GROUP_OUTFILE], "output", of_open); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "Error opening output files: "); + errmsg = "opening output files"; goto fail; } @@ -1345,7 +1346,8 @@ int ffmpeg_parse_options(int argc, char **argv) fail: uninit_parse_context(&octx); if (ret < 0) { - av_log(NULL, AV_LOG_FATAL, "%s\n", av_err2str(ret)); + av_log(NULL, AV_LOG_FATAL, "Error %s: %s\n", + errmsg ? errmsg : "", av_err2str(ret)); } return ret; }