summaryrefslogtreecommitdiffstats
path: root/DOCS/xml
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-09-20 16:13:33 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-09-20 16:13:33 +0300
commit849dc0ba31f209dfdb48146512e48ee2203d0ee6 (patch)
tree27b3fcc37410ea5f646eb5fc2411406f2cdee175 /DOCS/xml
parent259ea9d7034566760785fd5253f97b65ee8cd6ed (diff)
parent7756839a147ce2421cfb4e3de046364962094b60 (diff)
downloadmpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.bz2
mpv-849dc0ba31f209dfdb48146512e48ee2203d0ee6.tar.xz
Merge svn changes up to r27649
Conflicts: Makefile configure libvo/x11_common.c
Diffstat (limited to 'DOCS/xml')
-rw-r--r--DOCS/xml/en/mencoder.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index b52ada1986..4646937345 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -326,7 +326,8 @@ The name comes from the fact that this method encodes the file
<emphasis>twice</emphasis>. The first encoding (dubbed pass) creates some
temporary files (<filename>*.log</filename>) with a size of few megabytes, do
not delete them yet (you can delete the AVI or rather just not create any video
-by redirecting it into <filename>/dev/null</filename>).
+by redirecting it into <filename>/dev/null</filename>
+or on Windows into <filename>NUL</filename>).
In the second pass, the two pass output
file is created, using the bitrate data from the temporary files. The
resulting file will have much better image quality. If this is the first