From 74df1b73d491e790190d8a484ba2c8a531f90f07 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Mon, 18 Dec 2023 10:20:06 +0100 Subject: [PATCH] fftools/ffmpeg_opt: refine printing type-specific options * 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 9abf348a32..2ce83b6a61 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) {