Split show_usage() out of show_help().

Originally committed as revision 20904 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Ramiro Polla 15 years ago
parent 8319aefeec
commit 0c2a18cbcd
  1. 9
      ffmpeg.c
  2. 7
      ffplay.c

@ -3563,12 +3563,17 @@ static void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
vfprintf(stdout, fmt, vl);
}
static void show_help(void)
static void show_usage(void)
{
av_log_set_callback(log_callback_help);
printf("Hyper fast Audio and Video encoder\n");
printf("usage: ffmpeg [options] [[infile options] -i infile]... {[outfile options] outfile}...\n");
printf("\n");
}
static void show_help(void)
{
av_log_set_callback(log_callback_help);
show_usage();
show_help_options(options, "Main options:\n",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0);
show_help_options(options, "\nAdvanced options:\n",

@ -2490,11 +2490,16 @@ static const OptionDef options[] = {
{ NULL, },
};
static void show_help(void)
static void show_usage(void)
{
printf("Simple media player\n");
printf("usage: ffplay [options] input_file\n");
printf("\n");
}
static void show_help(void)
{
show_usage();
show_help_options(options, "Main options:\n",
OPT_EXPERT, 0);
show_help_options(options, "\nAdvanced options:\n",

Loading…
Cancel
Save