From patchwork Mon Dec 18 09:57:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 45214 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1225:b0:181:818d:5e7f with SMTP id v37csp7222132pzf; Mon, 18 Dec 2023 01:59:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IFcUR+fLtUAMdBx1yw0hQjjYghNw4+wtmgtIOzJZ22rVFDMtt5tDVemiJ6KXrEc05i2bOSZ X-Received: by 2002:a50:c005:0:b0:551:1764:8507 with SMTP id r5-20020a50c005000000b0055117648507mr6348114edb.56.1702893561987; Mon, 18 Dec 2023 01:59:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702893561; cv=none; d=google.com; s=arc-20160816; b=Fgz0RBlE0fj9HHrdZJM83Nugd+ZFb9oQ2FKfcxxwt1KrWb8oOq80duIr7LPZlvtMEl 8ke4aIao86gaTFmONVGGYmT7lZHPKNefhvFzq2UMDySktExZUyqaYVwNhOx1gae8ayod eoy21545KOYXyqzvWDDgSmRqQEHCWbB3F6lMrNcQR0eOV2l6pMLOWbVllthj5suW7PNI fyGJnZ+EkhioKyi6JFnRiBBaJAXuGSFXLYJR1NIhZbvP8OpSJru0vF7wXT/RsV39UByd AFMwmgxDWCgGySs7CqP+1qzWv/grkedcyGPoqAFdkAhusSE5qEIAeW1zrwGs0FytEToV s7RA== 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=RCwv1eAk5BDX/Juyjjk+1iZkYDsiFxNjVR3KFbWeYG4=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=cDuaIGcoitGgBZ5CbVHyVBRqt0AYCdsPAJ7Hqlt1PTp35P4DCBALvZSvpBpkwVcXKw fh53rUGzlaxH4/RgDHVBFZYswvfMo0nnNyPZwxKr1QUS+vdrGFhZrrLyhUh4TD9l/3c9 aseX/gklMaP7q+OWypapGblhkGngUU5cfwA+acqr3dHNDIz5378KzY9wjzE5xDI+Kgm5 sbYkkeTXbcd3C+nZF9dDAxiOy3VZR6mlwSDmnPtomvGloqq0O+b241w8qnkxR76NydnM HeGQlwIuFvb8mTEhg4exJ/GaqPDs4xutovj6Aisyh4W7wev8InXMkHyTG2Vh+4M0Pa2O 8kQA== 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 m9-20020a509989000000b005521b594eeasi5049011edb.438.2023.12.18.01.59.21; Mon, 18 Dec 2023 01:59:21 -0800 (PST) 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 9454568D213; Mon, 18 Dec 2023 11:58:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9409568D1EC for ; Mon, 18 Dec 2023 11:58:00 +0200 (EET) Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 77B921E04 for ; Mon, 18 Dec 2023 10:57:57 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id lfgFAUasfem7 for ; Mon, 18 Dec 2023 10:57:57 +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 mail1.khirnov.net (Postfix) with ESMTPS id 92FC93E16 for ; Mon, 18 Dec 2023 10:57:51 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A4BD23A0890 for ; Mon, 18 Dec 2023 10:57:44 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 Dec 2023 10:57:18 +0100 Message-ID: <20231218095722.25879-16-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231218095722.25879-1-anton@khirnov.net> References: <20231218095722.25879-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 16/20] fftools/ffmpeg_opt: refine printing type-specific 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: ksY6OdoPV/y3 * filter subtitle/data options out of main, video and audio sections * add filters that were missing entirely from the subtitle section * add a missing section for advanced subtitle options --- fftools/ffmpeg_opt.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 6656aa631c..c8fb9d03e4 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1216,25 +1216,29 @@ void show_help_default(const char *opt, const char *arg) OPT_PERFILE | OPT_EXIT, 0); show_help_options(options, "Per-file main options:", 0, - OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | + OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_DATA | OPT_EXIT, OPT_PERFILE); if (show_advanced) show_help_options(options, "Advanced per-file options:", OPT_EXPERT, OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, OPT_PERFILE); show_help_options(options, "Video options:", - OPT_VIDEO, OPT_EXPERT | OPT_AUDIO, 0); + OPT_VIDEO, OPT_EXPERT | OPT_AUDIO | OPT_SUBTITLE | OPT_DATA, 0); if (show_advanced) show_help_options(options, "Advanced Video options:", - OPT_EXPERT | OPT_VIDEO, OPT_AUDIO, 0); + OPT_EXPERT | OPT_VIDEO, OPT_AUDIO | OPT_SUBTITLE | OPT_DATA, 0); show_help_options(options, "Audio options:", - OPT_AUDIO, OPT_EXPERT | OPT_VIDEO, 0); + OPT_AUDIO, OPT_EXPERT | OPT_VIDEO | OPT_SUBTITLE | OPT_DATA, 0); if (show_advanced) show_help_options(options, "Advanced Audio options:", - OPT_EXPERT | OPT_AUDIO, OPT_VIDEO, 0); + OPT_EXPERT | OPT_AUDIO, OPT_VIDEO | OPT_SUBTITLE | OPT_DATA, 0); + show_help_options(options, "Subtitle options:", - OPT_SUBTITLE, 0, 0); + OPT_SUBTITLE, OPT_EXPERT | OPT_VIDEO | OPT_AUDIO | OPT_DATA, 0); + if (show_advanced) + show_help_options(options, "Advanced Subtitle options:", + OPT_EXPERT | OPT_SUBTITLE, OPT_VIDEO | OPT_AUDIO | OPT_DATA, 0); printf("\n"); if (show_avoptions) {