From: Stefano Sabatini <stefasab@gmail.com>
Date: Mon, 9 Jun 2014 17:02:53 +0000 (+0200)
Subject: doc/codecs: extend documentation for thread_type option
X-Git-Tag: n2.4-dev~464
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/8c443767995db7905282239f2a467a995609a6ff

doc/codecs: extend documentation for thread_type option

Based on avcodec.h documentation.
---

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
+it.
 
 Possible values:
 @table @samp
 @item slice
+Decode more than one part of a single frame at once.
 
-@item frame
+Multithreading using slices works only when the video was encoded with
+slices.
 
+@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.