Merge commit 'a7985cfd4c51b7fe2b870fc4ecd109707ee035d6'

[ffmpeg] / doc / codecs.texi

diff --git a/doc/codecs.texi b/doc/codecs.texi
index e1a244d6adf429e1f9bce801d882d8b36210e2f2..1160e5d800b049c89ccb2885ee3bcaab238ecb06 100644 (file)
--- 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.