aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-20 16:52:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-20 16:55:08 +0200
commit67a6dac7c18caecb418f7590a484dcbfcad869ab (patch)
treedfc518e76432ade673085eb8003c25edefb5fc53 /doc
parentc5af0680848a62c482c0fd142f8d6646cec46212 (diff)
parent7c5012127fb7e18f0616011257bb4248f6a8b608 (diff)
downloadffmpeg-67a6dac7c18caecb418f7590a484dcbfcad869ab.tar.gz
Merge commit '7c5012127fb7e18f0616011257bb4248f6a8b608'
* commit '7c5012127fb7e18f0616011257bb4248f6a8b608': cmdutils: change semantics of show_help_options() and document it. avtools: move some newlines to show_help_options(). avconv: deprecate -isync. Conflicts: ffmpeg_opt.c ffserver.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg.texi7
1 files changed, 0 insertions, 7 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 89c1eb84c7..ec8bed3c9d 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -639,13 +639,6 @@ lot.
@end table
-@section Audio/Video grab options
-
-@table @option
-@item -isync (@emph{global})
-Synchronize read on input.
-@end table
-
@section Advanced options
@table @option