Merge commit 'c1aac39eaccd32dc3b74ccfcce701d3d888fbc6b'

[ffmpeg] / doc / encoders.texi

diff --git a/doc/encoders.texi b/doc/encoders.texi
index f2d46dc6dd6c6ce2da9f876398ae50f796c2d0ed..ba7f2b7a9d9faed04ce06e7b6ed1adf5beff2564 100644 (file)
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -1411,7 +1411,7 @@ can be selected with @code{-pred 1}.
 @table @option
 @item format
 Can be set to either @code{j2k} or @code{jp2} (the default) that
-allows to store non-rgb pix_fmts.
+makes it possible to store non-rgb pix_fmts.
 
 @end table
 
@@ -2401,9 +2401,6 @@ configuration. You need to explicitly configure the build with
 @item b
 Set target video bitrate in bit/s and enable rate control.
 
-@item threads
-Set number of encoding threads.
-
 @item kvazaar-params
 Set kvazaar parameters as a list of @var{name}=@var{value} pairs separated
 by commas (,). See kvazaar documentation for a list of options.