aboutsummaryrefslogtreecommitdiffstats
path: root/doc/ffmpeg.texi
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2011-05-19 21:14:37 +0200
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2011-05-20 10:05:04 +0200
commit52da548c7dabac364cc38e4239edc56a28d0d63c (patch)
tree13259aae27a288958109d8daf1b41462821c0a1f /doc/ffmpeg.texi
parentc5385147cd74bc1892650c47531c7797f22b0b1d (diff)
downloadffmpeg-52da548c7dabac364cc38e4239edc56a28d0d63c.tar.gz
encoders.texi: add documentation for the libx264 encoder
Also remove -x264opts item from the ffmpeg manual, since it belongs to the encoders section.
Diffstat (limited to 'doc/ffmpeg.texi')
-rw-r--r--doc/ffmpeg.texi7
1 files changed, 0 insertions, 7 deletions
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 0cf1a829b2..77fde18564 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -312,13 +312,6 @@ the input video.
Use the option "-filters" to show all the available filters (including
also sources and sinks).
-@item -x264opts @var{option}
-Allows you to set any x264 option, see x264 manual for a list.
-@example
-ffmpeg -i foo.mpg -vcodec libx264 -x264opts keyint=123:min-keyint=20 -an out.mkv
-@end example
-
-
@end table
@section Advanced Video Options