Remove unnecessary calls to show_help(), make ffmpeg/ffplay print a

specific error message instead.

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

diff --git a/ffmpeg.c b/ffmpeg.c
index c53b8e6..9308cc4 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3874,10 +3874,6 @@ int main(int argc, char **argv)
     sws_opts = sws_getContext(16,16,0, 16,16,0, sws_flags, NULL,NULL,NULL);
 
     show_banner();
-    if (argc <= 1) {
-        show_help();
-        av_exit(1);
-    }
 
     /* parse options */
     parse_options(argc, argv, options, opt_output_file);

diff --git a/ffplay.c b/ffplay.c
index 67fbff2..f7ff48d 100644 (file)
--- a/ffplay.c
+++ b/ffplay.c
@@ -2553,7 +2553,7 @@ int main(int argc, char **argv)
     parse_options(argc, argv, options, opt_input_file);
 
     if (!input_filename) {
-        show_help();
+        fprintf(stderr, "An input file must be specified\n");
         exit(1);
     }