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

[ramiro]

Author: ramiro
Date: Mon Dec 21 03:12:34 2009
New Revision: 20904

Log:
Split show_usage() out of show_help().

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

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Dec 21 03:10:14 2009	(r20903)
+++ trunk/ffmpeg.c	Mon Dec 21 03:12:34 2009	(r20904)
@@ -3563,12 +3563,17 @@ static void log_callback_help(void* ptr,
     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",

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Mon Dec 21 03:10:14 2009	(r20903)
+++ trunk/ffplay.c	Mon Dec 21 03:12:34 2009	(r20904)
@@ -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",