in/outfile options

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

diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 639346b..f62a0ea 100644 (file)
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -131,7 +131,7 @@ The generic syntax is:
 
 @example 
 @c man begin SYNOPSIS
-ffmpeg [[options][@option{-i} @var{input_file}]]... @{[options] @var{output_file}@}...
+ffmpeg [[infile options][@option{-i} @var{infile}]]... @{[outfile options] @var{outfile}@}...
 @c man end
 @end example
 @c man begin DESCRIPTION

diff --git a/ffmpeg.c b/ffmpeg.c
index 903ad34..16e1f87 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3852,7 +3852,7 @@ static void show_license(void)
 static void show_help(void)
 {
     show_banner();
-    printf("usage: ffmpeg [[options] -i input_file]... {[options] outfile}...\n"
+    printf("usage: ffmpeg [[infile options] -i infile]... {[outfile options] outfile}...\n"
            "Hyper fast Audio and Video encoder\n");
     printf("\n");
     show_help_options(options, "Main options:\n",