First print the program description and then the basic usage line.

Originally committed as revision 20902 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index 401b8bb..2e3c610 100644 (file)
--- 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 5fe054f..e0b248e 100644 (file)
--- 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);