virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

avtools: move some newlines to show_help_options().

Browse Source 
Don't require every caller to supply them.
This commit is contained in:
Anton Khirnov 2012-08-11 19:33:27 +02:00
parent 79600a8354
commit dc4c24a3d3
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
avconv_opt.c
View File

@ -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; int flags = AV_OPT_FLAG_DECODING_PARAM | AV_OPT_FLAG_ENCODING_PARAM;
av_log_set_callback(log_callback_help); av_log_set_callback(log_callback_help);
show_usage(); show_usage();
show_help_options(options, "Main options:\n", show_help_options(options, "Main options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE, 0); 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 | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE,
OPT_EXPERT); OPT_EXPERT);
show_help_options(options, "\nVideo options:\n", show_help_options(options, "Video options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
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_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_VIDEO | OPT_EXPERT); OPT_VIDEO | OPT_EXPERT);
show_help_options(options, "\nAudio options:\n", show_help_options(options, "Audio options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_AUDIO); OPT_AUDIO);
show_help_options(options, "\nAdvanced Audio options:\n", show_help_options(options, "Advanced Audio options:",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO, OPT_EXPERT | OPT_AUDIO | OPT_VIDEO,
OPT_AUDIO | OPT_EXPERT); OPT_AUDIO | OPT_EXPERT);
show_help_options(options, "\nSubtitle options:\n", show_help_options(options, "Subtitle options:",
OPT_SUBTITLE, OPT_SUBTITLE); OPT_SUBTITLE, OPT_SUBTITLE);
printf("\n"); printf("\n");
show_help_children(avcodec_get_class(), flags); show_help_children(avcodec_get_class(), flags);

4
avplay.c
View File

@ -2926,9 +2926,9 @@ static int show_help(const char *opt, const char *arg)
{ {
av_log_set_callback(log_callback_help); av_log_set_callback(log_callback_help);
show_usage(); show_usage();
show_help_options(options, "Main options:\n", show_help_options(options, "Main options:",
OPT_EXPERT, 0); OPT_EXPERT, 0);
show_help_options(options, "\nAdvanced options:\n", show_help_options(options, "Advanced options:",
OPT_EXPERT, OPT_EXPERT); OPT_EXPERT, OPT_EXPERT);
printf("\n"); printf("\n");
show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM); show_help_children(avcodec_get_class(), AV_OPT_FLAG_DECODING_PARAM);

2
avprobe.c
View File

@ -872,7 +872,7 @@ static int show_help(const char *opt, const char *arg)
{ {
av_log_set_callback(log_callback_help); av_log_set_callback(log_callback_help);
show_usage(); show_usage();
show_help_options(options, "Main options:\n", 0, 0); show_help_options(options, "Main options:", 0, 0);
printf("\n"); printf("\n");
show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM); show_help_children(avformat_get_class(), AV_OPT_FLAG_DECODING_PARAM);
return 0; return 0;

2
avserver.c
View File

@ -4634,7 +4634,7 @@ static void show_help(void)
printf("usage: avserver [options]\n" printf("usage: avserver [options]\n"
"Hyper fast multi format Audio/Video streaming server\n"); "Hyper fast multi format Audio/Video streaming server\n");
printf("\n"); printf("\n");
show_help_options(options, "Main options:\n", 0, 0); show_help_options(options, "Main options:", 0, 0);
} }
static const OptionDef options[] = { static const OptionDef options[] = {

3
cmdutils.c
View File

@ -124,7 +124,7 @@ void show_help_options(const OptionDef *options, const char *msg, int mask,
char buf[64]; char buf[64];
if ((po->flags & mask) == value) { if ((po->flags & mask) == value) {
if (first) { if (first) {
printf("%s", msg); printf("%s\n", msg);
first = 0; first = 0;
} }
av_strlcpy(buf, po->name, sizeof(buf)); 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("-%-17s %s\n", buf, po->help);
} }
} }
printf("\n");
} }
void show_help_children(const AVClass *class, int flags) void show_help_children(const AVClass *class, int flags)