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

[ramiro]

Author: ramiro
Date: Mon Dec 21 03:15:46 2009
New Revision: 20905

Log:
Print usage instead of help when no files are specified.

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

Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	Mon Dec 21 03:12:34 2009	(r20904)
+++ trunk/ffmpeg.c	Mon Dec 21 03:15:46 2009	(r20905)
@@ -3995,8 +3995,11 @@ int main(int argc, char **argv)
     /* parse options */
     parse_options(argc, argv, options, opt_output_file);
 
-    if(nb_output_files <= 0 && nb_input_files == 0)
-        show_help();
+    if(nb_output_files <= 0 && nb_input_files == 0) {
+        show_usage();
+        fprintf(stderr, "Use -h to get full help or, even better, run 'man ffmpeg'\n");
+        av_exit(1);
+    }
 
     /* file converter / grab */
     if (nb_output_files <= 0) {

Modified: trunk/ffplay.c
==============================================================================
--- trunk/ffplay.c	Mon Dec 21 03:12:34 2009	(r20904)
+++ trunk/ffplay.c	Mon Dec 21 03:15:46 2009	(r20905)
@@ -2546,8 +2546,9 @@ int main(int argc, char **argv)
     parse_options(argc, argv, options, opt_input_file);
 
     if (!input_filename) {
-        show_help();
+        show_usage();
         fprintf(stderr, "An input file must be specified\n");
+        fprintf(stderr, "Use -h to get full help or, even better, run 'man ffplay'\n");
         exit(1);
     }