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 E63DD48775 for ; Wed, 17 Jan 2024 12:41:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D800268CF84; Wed, 17 Jan 2024 14:41:37 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2960C68CEF0 for ; Wed, 17 Jan 2024 14:41:31 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=iAiGKeQ1; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 6EEC719DB for ; Wed, 17 Jan 2024 13:41:30 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id NlBVj91FBG2D for ; Wed, 17 Jan 2024 13:41:29 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1705495289; bh=nFtzLAAiAL2QgA1hV5bsMO2+O8O7vDHMJGt2mITcFXM=; h=From:To:Subject:Date:In-Reply-To:References:From; b=iAiGKeQ1U/p/DaMXEsizEPUs5Xe4kq2KwGVd66+trewuJvANTuuuYPpqRX0bR8+yM 28ygprTWapE0BL4wgXih+JD0ymk6ZOcgXILXshco38i7/+7Qn+SI0+ucG8MLrtO3n+ 8fS+TKKc6cjy5e51zr9WmmTZg08GgDeIwWKedokI9ei+vWZhfpMDJtw3ukQv43UBH4 Cfpsh+h17gZ05IYoAUsPzx5l2vxrJdFf96tlPXs27bWtRjco6h+2jAeww0ih/tYHvg E7dbDltQk16HyWIwPANqunVk7s0oLxBPToHXZM+hgiNpjVoARVBYGOBs+5XpIaFWeN gyDcIQhnNnIvQ== 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 mail1.khirnov.net (Postfix) with ESMTPS id 6FC8319B7 for ; Wed, 17 Jan 2024 13:41:29 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 5B7323A0582 for ; Wed, 17 Jan 2024 13:41:29 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Jan 2024 13:40:30 +0100 Message-ID: <20240117124036.7877-3-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240117124036.7877-1-anton@khirnov.net> References: <20240117124036.7877-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/8] fftools/cmdutils: drop alt_flags parameter from show_help_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 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: No user sets it to more than one flag, so it is redundant with req_flags. --- fftools/cmdutils.c | 3 +-- fftools/cmdutils.h | 3 +-- fftools/ffmpeg_opt.c | 28 ++++++++++++++-------------- fftools/ffplay.c | 4 ++-- fftools/ffprobe.c | 2 +- 5 files changed, 19 insertions(+), 21 deletions(-) diff --git a/fftools/cmdutils.c b/fftools/cmdutils.c index d7d5ddee45..be01372743 100644 --- a/fftools/cmdutils.c +++ b/fftools/cmdutils.c @@ -108,7 +108,7 @@ int parse_number(const char *context, const char *numstr, enum OptionType type, } void show_help_options(const OptionDef *options, const char *msg, int req_flags, - int rej_flags, int alt_flags) + int rej_flags) { const OptionDef *po; int first; @@ -118,7 +118,6 @@ void show_help_options(const OptionDef *options, const char *msg, int req_flags, char buf[128]; if (((po->flags & req_flags) != req_flags) || - (alt_flags && !(po->flags & alt_flags)) || (po->flags & rej_flags)) continue; diff --git a/fftools/cmdutils.h b/fftools/cmdutils.h index 0c3b475876..69e253c6ef 100644 --- a/fftools/cmdutils.h +++ b/fftools/cmdutils.h @@ -200,10 +200,9 @@ typedef struct OptionDef { * @param msg title of this group. Only printed if at least one option matches. * @param req_flags print only options which have all those flags set. * @param rej_flags don't print options which have any of those flags set. - * @param alt_flags print only options that have at least one of those flags set */ void show_help_options(const OptionDef *options, const char *msg, int req_flags, - int rej_flags, int alt_flags); + int rej_flags); /** * Show help for all options with given flags in class and all its diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 4a0d126aca..919e1eae46 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1197,46 +1197,46 @@ void show_help_default(const char *opt, const char *arg) "\n", program_name); show_help_options(options, "Print help / information / capabilities:", - OPT_EXIT, OPT_EXPERT, 0); + OPT_EXIT, OPT_EXPERT); if (show_advanced) show_help_options(options, "Advanced information / capabilities:", - OPT_EXIT | OPT_EXPERT, 0, 0); + OPT_EXIT | OPT_EXPERT, 0); show_help_options(options, "Global options (affect whole program " "instead of just one file):", - 0, OPT_PERFILE | OPT_EXIT | OPT_EXPERT, 0); + 0, OPT_PERFILE | OPT_EXIT | OPT_EXPERT); if (show_advanced) show_help_options(options, "Advanced global options:", OPT_EXPERT, - OPT_PERFILE | OPT_EXIT, 0); + OPT_PERFILE | OPT_EXIT); - show_help_options(options, "Per-file main options:", 0, + show_help_options(options, "Per-file main options:", OPT_PERFILE, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_DATA | - OPT_EXIT, OPT_PERFILE); + OPT_EXIT); if (show_advanced) show_help_options(options, "Advanced per-file options:", - OPT_EXPERT, OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, OPT_PERFILE); + OPT_EXPERT | OPT_PERFILE, OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE); show_help_options(options, "Video options:", - OPT_VIDEO, OPT_EXPERT | OPT_AUDIO | OPT_SUBTITLE | OPT_DATA, 0); + OPT_VIDEO, OPT_EXPERT | OPT_AUDIO | OPT_SUBTITLE | OPT_DATA); if (show_advanced) show_help_options(options, "Advanced Video options:", - OPT_EXPERT | OPT_VIDEO, OPT_AUDIO | OPT_SUBTITLE | OPT_DATA, 0); + OPT_EXPERT | OPT_VIDEO, OPT_AUDIO | OPT_SUBTITLE | OPT_DATA); show_help_options(options, "Audio options:", - OPT_AUDIO, OPT_EXPERT | OPT_VIDEO | OPT_SUBTITLE | OPT_DATA, 0); + OPT_AUDIO, OPT_EXPERT | OPT_VIDEO | OPT_SUBTITLE | OPT_DATA); if (show_advanced) show_help_options(options, "Advanced Audio options:", - OPT_EXPERT | OPT_AUDIO, OPT_VIDEO | OPT_SUBTITLE | OPT_DATA, 0); + OPT_EXPERT | OPT_AUDIO, OPT_VIDEO | OPT_SUBTITLE | OPT_DATA); show_help_options(options, "Subtitle options:", - OPT_SUBTITLE, OPT_EXPERT | OPT_VIDEO | OPT_AUDIO | OPT_DATA, 0); + OPT_SUBTITLE, OPT_EXPERT | OPT_VIDEO | OPT_AUDIO | OPT_DATA); if (show_advanced) show_help_options(options, "Advanced Subtitle options:", - OPT_EXPERT | OPT_SUBTITLE, OPT_VIDEO | OPT_AUDIO | OPT_DATA, 0); + OPT_EXPERT | OPT_SUBTITLE, OPT_VIDEO | OPT_AUDIO | OPT_DATA); if (show_advanced) show_help_options(options, "Data stream options:", - OPT_DATA, OPT_VIDEO | OPT_AUDIO | OPT_SUBTITLE, 0); + OPT_DATA, OPT_VIDEO | OPT_AUDIO | OPT_SUBTITLE); printf("\n"); if (show_avoptions) { diff --git a/fftools/ffplay.c b/fftools/ffplay.c index e0f6db46bc..61edf2c2ef 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -3705,8 +3705,8 @@ void show_help_default(const char *opt, const char *arg) { av_log_set_callback(log_callback_help); show_usage(); - show_help_options(options, "Main options:", 0, OPT_EXPERT, 0); - show_help_options(options, "Advanced options:", OPT_EXPERT, 0, 0); + show_help_options(options, "Main options:", 0, OPT_EXPERT); + show_help_options(options, "Advanced options:", OPT_EXPERT, 0); printf("\n"); show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM); show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); diff --git a/fftools/ffprobe.c b/fftools/ffprobe.c index ea1365688d..f33e2471cb 100644 --- a/fftools/ffprobe.c +++ b/fftools/ffprobe.c @@ -3869,7 +3869,7 @@ void show_help_default(const char *opt, const char *arg) { av_log_set_callback(log_callback_help); show_usage(); - show_help_options(options, "Main options:", 0, 0, 0); + show_help_options(options, "Main options:", 0, 0); printf("\n"); show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); -- 2.42.0 _______________________________________________ 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".