# HG changeset patch
# User lorenm
# Date 1168557294 0
# Node ID 40aee430884111b9839048547a0124e1a9f7f249
# Parent  3ede153201f42e5554c649a51d51294e21ee5c22
sync to x264 r607 (update description of threads)

diff -r 3ede153201f4 -r 40aee4308841 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Thu Jan 11 18:26:44 2007 +0000
+++ b/DOCS/man/en/mplayer.1	Thu Jan 11 23:14:54 2007 +0000
@@ -9590,12 +9590,11 @@
 and you have a need to set it.
 .
 .TP
-.B threads=<1\-4>
-Split each frame into slices and encode them in parallel (default: 1).
-Also allows multithreaded decoding if the decoder supports it (lavc does not).
-This has a slight penalty to compression.
-Requires that libx264 was compiled with pthread support; if not, this
-option will produce a warning and enables slices but not multithreading.
+.B threads=<0\-16>
+Spawn threads to encode in parallel on multiple CPUs (default: 1).
+This has a slight penalty to compression quality.
+0 or 'auto' tells x264 to detect how many CPUs you have and pick an
+appropriate number of threads.
 .
 .TP
 .B (no)global_header