aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-12-21 02:09:17 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-12-21 02:09:17 +0000
commit27daa420fc83daeb07f2d2a4a7c4f0112d888076 (patch)
tree16d4667a4a2a453f1657532b0faaf60abea63192
parentaaba7e6c66fab2b3b844fc10bf6308c6e01675c4 (diff)
downloadffmpeg-27daa420fc83daeb07f2d2a4a7c4f0112d888076.tar.gz
First print the program description and then the basic usage line.
Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--ffmpeg.c4
-rw-r--r--ffplay.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 401b8bb29d..2e3c6100b6 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3566,8 +3566,8 @@ static void log_callback_help(void* ptr, int level, const char* fmt, va_list vl)
static void show_help(void)
{
av_log_set_callback(log_callback_help);
- printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n"
- "Hyper fast Audio and Video encoder\n");
+ printf("Hyper fast Audio and Video encoder\n");
+ printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n");
printf("\n");
show_help_options(options, "Main options:\n",
OPT_EXPERT | OPT_AUDIO | OPT_VIDEO | OPT_SUBTITLE | OPT_GRAB, 0);
diff --git a/ffplay.c b/ffplay.c
index 5fe054f666..e0b248e393 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2492,8 +2492,8 @@ static const OptionDef options[] = {
static void show_help(void)
{
- printf("usage: ffplay [options] input_file\n"
- "Simple media player\n");
+ printf("Simple media player\n");
+ printf("usage: ffplay [options] input_file\n");
printf("\n");
show_help_options(options, "Main options:\n",
OPT_EXPERT, 0);