From patchwork Wed Jul 26 15:31:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 42996 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7528:b0:130:ccc6:6c4b with SMTP id r40csp603114pzd; Wed, 26 Jul 2023 08:32:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlEQ5G7oI75tY9CoADSehBkQNCMU9wHmEF6FPk+sQJqFyj/YwaiTlGMo2ipOcBYd35tvHrg1 X-Received: by 2002:a17:906:518a:b0:99b:7f52:ccdc with SMTP id y10-20020a170906518a00b0099b7f52ccdcmr1606821ejk.0.1690385526024; Wed, 26 Jul 2023 08:32:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690385526; cv=none; d=google.com; s=arc-20160816; b=XG7JhdWhR+6riKvrgKqxOuN92aRt/L2s0FjDnf+crfqkME+Ioeb63kaBXtn41BXkRV ojRURphWmzDD9mhRnjiwrZiuBMZkgn+T93lBOKtJl8lnE4sK9shZUSrzgUkkn6aSGPRL LXQNMXwFBG0lPWpLiVApQrBhU8mSFtQgtNT8dJMxlmTUppPYrQvYRCGmeN8pdnOLw9Nt Mv3xoYXQ56plQLzDyC4aRsNlQjggmUmNrOd9Jcl24duJCOFFizz+w645uFmFMskt8TP+ zsLrUq/WawEqxYE4MHnjNA7xAKNu+zELqMS+kI8rCQilALAxhY2nuktlveIMNbkOk96r QJXA== 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:message-id:date:to:from :delivered-to; bh=6QNAFtsy2MlRMXU8dElckNv1nQRxPoBc5P2lsfAgTyw=; fh=8ZF2QtiKOjBtyn9wuO2cMeZaLsE4aq02Bq77gGK61E8=; b=SkUGCqlKruposqc/lcAXKIjzVwuRaBWrclALgYxPrweV7fco09cVhrKl/hSuQXG+HA kO5DQWzIRPVhtQG7p77kKyGIA29uJuKyhwDFJXxMsx+ModtLGMN55sxRaOXBgp1eT+c0 o6kRiTLadmbQ6kYqTmdYim+2wNF2VdxDvPdo2gWdAYK0V37O+7Dj+3DosLNRQMG3Rnyx pOUCWTaj1JaTz1S4oQvgcDRJgc9DaKf26MLyqsfaJ8mz2TBIMyvbUlF7bIUty/Bb2T3P ohpmDJyfuwN3frfOUVMEI/dewZvCMAZnH6GU005wCJbAiqpyQn9Uzqct3c45NYeN63t0 N6vA== 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 k21-20020a1709063e1500b00992d730e99dsi9586125eji.494.2023.07.26.08.32.05; Wed, 26 Jul 2023 08:32:06 -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 742E668C96C; Wed, 26 Jul 2023 18:32:02 +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 6170D68C8C9 for ; Wed, 26 Jul 2023 18:31:55 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A8B622404EC for ; Wed, 26 Jul 2023 17:31:54 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id p4pvd3Nab2hn for ; Wed, 26 Jul 2023 17:31:54 +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 16E262404EA for ; Wed, 26 Jul 2023 17:31:54 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id C55A43A022D for ; Wed, 26 Jul 2023 17:31:47 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Jul 2023 17:31:38 +0200 Message-Id: <20230726153138.9190-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffprobe: fix handling parse_options() return value 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: Cy5mas6zvdQy --- fftools/ffprobe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index a39185f6fe..81610c097b 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -4113,7 +4113,7 @@ int main(int argc, char **argv) show_banner(argc, argv, options); ret = parse_options(NULL, argc, argv, options, opt_input_file); if (ret < 0) { - ret = AVERROR_EXIT ? 0 : ret; + ret = (ret == AVERROR_EXIT) ? 0 : ret; goto end; }