summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en
diff options
context:
space:
mode:
authorlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-11 23:14:54 +0000
committerlorenm <lorenm@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-11 23:14:54 +0000
commit000b9278efa2723fd5a08ad34ebccf8b30966f6a (patch)
tree4aeab5523f91620e4a8af7955b842e6446d5bbf5 /DOCS/man/en
parent72a119b5cd8b03ae312a03ec590d5a5767809191 (diff)
downloadmpv-000b9278efa2723fd5a08ad34ebccf8b30966f6a.tar.bz2
mpv-000b9278efa2723fd5a08ad34ebccf8b30966f6a.tar.xz
sync to x264 r607 (update description of threads)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21882 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/man/en')
-rw-r--r--DOCS/man/en/mplayer.111
1 files changed, 5 insertions, 6 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 6ec38aa7ad..69b03dc5a0 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -9590,12 +9590,11 @@ Use this parameter only if you know what it means,
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