[FFmpeg-cvslog] r20902 - in trunk: ffmpeg.c ffplay.c

ramiro subversion
Mon Dec 21 03:09:17 CET 2009


Author: ramiro
Date: Mon Dec 21 03:09:17 2009
New Revision: 20902

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

Modified:
   trunk/ffmpeg.c
   trunk/ffplay.c

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Sun Dec 20 17:31:21 2009	(r20901)
+++ trunk/ffmpeg.c	Mon Dec 21 03:09:17 2009	(r20902)
@@ -3566,8 +3566,8 @@ static void log_callback_help(void* ptr,
 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);

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Sun Dec 20 17:31:21 2009	(r20901)
+++ trunk/ffplay.c	Mon Dec 21 03:09:17 2009	(r20902)
@@ -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);



More information about the ffmpeg-cvslog mailing list