[FFmpeg-cvslog] doc/codecs: extend documentation for thread_type option

Stefano Sabatini git at videolan.org
Fri Jun 20 12:23:25 CEST 2014

ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Mon Jun  9 19:02:53 2014 +0200| [8c443767995db7905282239f2a467a995609a6ff] | committer: Stefano Sabatini

doc/codecs: extend documentation for thread_type option

Based on avcodec.h documentation.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8c443767995db7905282239f2a467a995609a6ff

 doc/codecs.texi |   15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/doc/codecs.texi b/doc/codecs.texi
index e1a244d..1160e5d 100644
--- a/doc/codecs.texi
+++ b/doc/codecs.texi
@@ -1035,15 +1035,26 @@ Set the log level offset.
 Number of slices, used in parallelized encoding.
 @item thread_type @var{flags} (@emph{decoding/encoding,video})
-Select multithreading type.
+Select which multithreading methods to use.
+Use of @samp{frame} will increase decoding delay by one frame per
+thread, so clients which cannot provide future frames should not use
 Possible values:
 @table @samp
 @item slice
+Decode more than one part of a single frame at once.
- at item frame
+Multithreading using slices works only when the video was encoded with
+ at item frame
+Decode more than one frame at once.
 @end table
+Default value is @samp{slice+frame}.
 @item audio_service_type @var{integer} (@emph{encoding,audio})
 Set audio service type.

More information about the ffmpeg-cvslog mailing list