aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2004-07-14 02:39:55 +0000
committerMichael Niedermayer <michaelni@gmx.at>2004-07-14 02:39:55 +0000
commit28f88dc8267eee3ab9857743b7675a516216e0a8 (patch)
tree3bc25a34b876a4bcc35a4201f03a4c0f25b891fb
parent23c992532927afa9d3a00677ff40cd071e21dc8f (diff)
downloadffmpeg-28f88dc8267eee3ab9857743b7675a516216e0a8.tar.gz
in/outfile options
Originally committed as revision 3311 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--doc/ffmpeg-doc.texi2
-rw-r--r--ffmpeg.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index 639346b49b..f62a0eabf9 100644
--- 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 903ad34b00..16e1f8724b 100644
--- 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",