From patchwork Tue Mar 15 09:05:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 34750 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp2837738nkb; Tue, 15 Mar 2022 02:07:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz4o5MmEk6liYQeOABmctNdheaTaqBpJbAOGCZWG0ju+yY0i2T1eIIJmOoobVqFFkbbA6Nb X-Received: by 2002:a17:906:b1d0:b0:6cf:7f39:50e0 with SMTP id bv16-20020a170906b1d000b006cf7f3950e0mr22573500ejb.760.1647335240958; Tue, 15 Mar 2022 02:07:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647335240; cv=none; d=google.com; s=arc-20160816; b=VWdhtjPrySmvaN+9TfT8ZcPYo5W+QwmRJ8EtFMJPV1EQ9rxwKV6UvWiNBZAXA5ke/g 4n3cQtpk4zNedb/Sro6G+DBPVBtrQbBNR3b6WsOfu9+EwBfdVqPpSm7S2ABXl2r//EsQ IU/9/hS/3eublt+gGv89aPBjMGNLpxcdOgIY69ymZRPfqOVdySFl9Nq38ydAmNcsoO1g x9d94XrB2yvJLXudSJNtcua/U9XYIixSqqjAAsqWVq+XDBuBSdmeO+R7XEXog9h/T0k2 vEQKuQjKTB2E691lZ4fEkAuR/kwNNm9U/JNpqSyv62VzgUwjYj/4u6gmAK0jPLJTpONE 6B0Q== 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=jG7L8FFdTrh+Ohcb8wBCA/tU5l4t49su7864OC4NV8k=; b=JU47NfGBFs3IPw1fiSYt2018MsNi01GJLme0wIAMejrgnm3RCSHGaARMWboU9NMz1u +8OoZFNZErFO/ohLzWhOVVA5JEdcDa9fGbUkGc2avQPKhlYVAr5yG+C85sX7EY8nAOz1 9kNu6ZrdTUq/lO4z3wXnAW52TdgHsE3x5bwrwM82YH8Epeg7nUB2DummWfHNi9bdRpqz XqVwESe4bV8tAVhgcgZdLPZH7WG6n37Yz/MW+OcsYfIBEPpmXi3BEGDmARYkOKBHGze8 j0MZaylJ2l2BM/U2+4ecrqTMX2r83plAraRmZYqmmCckgW0QouO8AYQFXKPsGL8rXTd8 6fJQ== 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 lm23-20020a170906981700b006df5ed0578dsi202499ejb.36.2022.03.15.02.07.20; Tue, 15 Mar 2022 02:07:20 -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 50F7C68B17E; Tue, 15 Mar 2022 11:06:03 +0200 (EET) 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 0CF2268B1E7 for ; Tue, 15 Mar 2022 11:05:54 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 98BE6240507 for ; Tue, 15 Mar 2022 10:05:52 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id dbf-96ALZMor for ; Tue, 15 Mar 2022 10:05:51 +0100 (CET) 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 B5C78240511 for ; Tue, 15 Mar 2022 10:05:46 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 284B73A0837; Tue, 15 Mar 2022 10:05:46 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 10:05:31 +0100 Message-Id: <20220315090532.27295-9-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220315090532.27295-1-anton@khirnov.net> References: <20220315090532.27295-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] fftools: drop the fake "default" option from ffplay/ffprobe 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: KhLIqZ/F45+G It tries to process any unhandled options as AVOptions. Handle this directly in cmdutils.c, without resorting to a confusing fake option definition (which is currently visible to the users in -help output). --- fftools/cmdutils.c | 8 +++++++- fftools/ffplay.c | 1 - fftools/ffprobe.c | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index e5684fa840..a52c87dfaf 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -302,6 +302,12 @@ static int write_option(void *optctx, const OptionDef *po, const char *opt, int parse_option(void *optctx, const char *opt, const char *arg, const OptionDef *options) { + static const OptionDef opt_avoptions = { + .name = "AVOption passthrough", + .flags = HAS_ARG, + .u.func_arg = opt_default, + }; + const OptionDef *po; int ret; @@ -315,7 +321,7 @@ int parse_option(void *optctx, const char *opt, const char *arg, arg = "1"; if (!po->name) - po = find_option(options, "default"); + po = &opt_avoptions; if (!po->name) { av_log(NULL, AV_LOG_ERROR, "Unrecognized option '%s'\n", opt); return AVERROR(EINVAL); diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 38df91f72e..59fba0e169 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3607,7 +3607,6 @@ static const OptionDef options[] = { #endif { "rdftspeed", OPT_INT | HAS_ARG| OPT_AUDIO | OPT_EXPERT, { &rdftspeed }, "rdft speed", "msecs" }, { "showmode", HAS_ARG, { .func_arg = opt_show_mode}, "select show mode (0 = video, 1 = waves, 2 = RDFT)", "mode" }, - { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, { .func_arg = opt_default }, "generic catch all option", "" }, { "i", OPT_BOOL, { &dummy}, "read specified file", "input_file"}, { "codec", HAS_ARG, { .func_arg = opt_codec}, "force decoder", "decoder_name" }, { "acodec", HAS_ARG | OPT_STRING | OPT_EXPERT, { &audio_codec_name }, "force audio decoder", "decoder_name" }, diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index c4e962389f..db8930f226 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3898,7 +3898,6 @@ static const OptionDef real_options[] = { { "private", OPT_BOOL, { &show_private_data }, "same as show_private_data" }, { "bitexact", OPT_BOOL, {&do_bitexact}, "force bitexact output" }, { "read_intervals", HAS_ARG, {.func_arg = opt_read_intervals}, "set read intervals", "read_intervals" }, - { "default", HAS_ARG | OPT_AUDIO | OPT_VIDEO | OPT_EXPERT, {.func_arg = opt_default}, "generic catch all option", "" }, { "i", HAS_ARG, {.func_arg = opt_input_file_i}, "read specified file", "input_file"}, { "print_filename", HAS_ARG, {.func_arg = opt_print_filename}, "override the printed input filename", "print_file"}, { "find_stream_info", OPT_BOOL | OPT_INPUT | OPT_EXPERT, { &find_stream_info },