aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorRamiro Polla <ramiro.polla@gmail.com>2009-12-21 02:15:46 +0000
committerRamiro Polla <ramiro.polla@gmail.com>2009-12-21 02:15:46 +0000
commit7f11e745b27bfbac6b2a18daffc44173530bd6d5 (patch)
tree1a4d5a523ec090c28ea51e4221682e3630f84999 /ffmpeg.c
parent0c2a18cbcdbaa931cb151692a340c0b4cab05028 (diff)
downloadffmpeg-7f11e745b27bfbac6b2a18daffc44173530bd6d5.tar.gz
Print usage instead of help when no files are specified.
Originally committed as revision 20905 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 19e4405a5e..31580684fe 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -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) {