Commit dc4c24a3 authored by Anton Khirnov's avatar Anton Khirnov

avtools: move some newlines to show_help_options().

Don't require every caller to supply them.
parent 79600a83
......@@ -1794,24 +1794,24 @@ static int show_help(const char *opt, const char *arg)
int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM;
av_log_set_callback(log_callback_help);
show_usage();
show_help_options(options, "Main options:\n",
show_help_options(options, "Main options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, 0);
show_help_options(options, "\nAdvanced options:\n",
show_help_options(options, "Advanced options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE,
OPT_EXPERT);
show_help_options(options, "\nVideo options:\n",
show_help_options(options, "Video options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_VIDEO);
show_help_options(options, "\nAdvanced Video options:\n",
show_help_options(options, "Advanced Video options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_VIDEO | OPT_EXPERT);
show_help_options(options, "\nAudio options:\n",
show_help_options(options, "Audio options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_AUDIO);
show_help_options(options, "\nAdvanced Audio options:\n",
show_help_options(options, "Advanced Audio options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_AUDIO | OPT_EXPERT);
show_help_options(options, "\nSubtitle options:\n",
show_help_options(options, "Subtitle options:",
OPT_SUBTITLE, OPT_SUBTITLE);
printf("\n");
show_help_children(avcodec_get_class(), flags);
......
......@@ -2926,9 +2926,9 @@ static int show_help(const char *opt, const char *arg)
{
av_log_set_callback(log_callback_help);
show_usage();
show_help_options(options, "Main options:\n",
show_help_options(options, "Main options:",
OPT_EXPERT, 0);
show_help_options(options, "\nAdvanced options:\n",
show_help_options(options, "Advanced options:",
OPT_EXPERT, OPT_EXPERT);
printf("\n");
show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);
......
......@@ -872,7 +872,7 @@ static int show_help(const char *opt, const char *arg)
{
av_log_set_callback(log_callback_help);
show_usage();
show_help_options(options, "Main options:\n", 0, 0);
show_help_options(options, "Main options:", 0, 0);
printf("\n");
show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
return 0;
......
......@@ -4634,7 +4634,7 @@ static void show_help(void)
printf("usage: avserver [options]\n"
"Hyper fast multi format Audio/Video streaming server\n");
printf("\n");
show_help_options(options, "Main options:\n", 0, 0);
show_help_options(options, "Main options:", 0, 0);
}
static const OptionDef options[] = {
......
......@@ -124,7 +124,7 @@ void show_help_options(const OptionDef *options, const char *msg, int mask,
char buf[64];
if ((po->flags & mask) == value) {
if (first) {
printf("%s", msg);
printf("%s\n", msg);
first = 0;
}
av_strlcpy(buf, po->name, sizeof(buf));
......@@ -135,6 +135,7 @@ void show_help_options(const OptionDef *options, const char *msg, int mask,
printf("-%-17s %s\n", buf, po->help);
}
}
printf("\n");
}
void show_help_children(const AVClass *class, int flags)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment