Print usage instead of help when no files are specified.

Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Ramiro Polla 15 years ago
parent 0c2a18cbcd
commit 7f11e745b2
  1. 7
      ffmpeg.c
  2. 3
      ffplay.c

@ -3995,8 +3995,11 @@ int main(int argc, char **argv)
/* parse options */ /* parse options */
parse_options(argc, argv, options, opt_output_file); parse_options(argc, argv, options, opt_output_file);
if(nb_output_files <= 0 && nb_input_files == 0) if(nb_output_files <= 0 && nb_input_files == 0) {
show_help(); show_usage();
fprintf(stderr, "Use -h to get full help or, even better, run 'man ffmpeg'\n");
av_exit(1);
}
/* file converter / grab */ /* file converter / grab */
if (nb_output_files <= 0) { if (nb_output_files <= 0) {

@ -2546,8 +2546,9 @@ int main(int argc, char **argv)
parse_options(argc, argv, options, opt_input_file); parse_options(argc, argv, options, opt_input_file);
if (!input_filename) { if (!input_filename) {
show_help(); show_usage();
fprintf(stderr, "An input file must be specified\n"); 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); exit(1);
} }

Loading…
Cancel
Save