# HG changeset patch
# User diego
# Date 1105137181 0
# Node ID 4a70b65cd2ae179f8422b9c2d1ba5cd2f48ab027
# Parent 811bb375f996d483ea28e4571a3e0154de9207b7
consistent "two pass" spelling
diff -r 811bb375f996 -r 4a70b65cd2ae DOCS/xml/en/documentation.xml
--- a/DOCS/xml/en/documentation.xml Fri Jan 07 22:26:09 2005 +0000
+++ b/DOCS/xml/en/documentation.xml Fri Jan 07 22:33:01 2005 +0000
@@ -95,7 +95,7 @@
(AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA)
to other MPlayer-playable formats (see below). It
can encode with various codecs, like MPEG-4 (DivX4)
-(1 or 2 passes), libavcodec,
+(one or two passes), libavcodec,
PCM/MP3/VBR MP3
audio.
diff -r 811bb375f996 -r 4a70b65cd2ae DOCS/xml/en/install.xml
--- a/DOCS/xml/en/install.xml Fri Jan 07 22:26:09 2005 +0000
+++ b/DOCS/xml/en/install.xml Fri Jan 07 22:33:01 2005 +0000
@@ -205,7 +205,7 @@
and encoding. Features:
- 1 pass or 2 pass encoding with
+ one pass or two pass encoding with
MEncoder
@@ -223,7 +223,7 @@
DivX4Linux. Features:
- 1 pass or 2 pass encoding with
+ one pass or two pass encoding with
MEncoder
diff -r 811bb375f996 -r 4a70b65cd2ae DOCS/xml/en/mencoder.xml
--- a/DOCS/xml/en/mencoder.xml Fri Jan 07 22:26:09 2005 +0000
+++ b/DOCS/xml/en/mencoder.xml Fri Jan 07 22:33:01 2005 +0000
@@ -15,13 +15,13 @@
-Encoding 2-pass MPEG-4 ("DivX")
+Encoding two pass MPEG-4 ("DivX")
The name comes from the fact that this method encodes the file twice.
The first encoding (dubbed pass) creates some temporary files
(*.log) with a size of few megabytes, do not delete
-them yet (you can delete the AVI). In the second pass, the 2-pass output
+them yet (you can delete the AVI). 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
time you heard about this, you should consult some guides available on the
@@ -31,7 +31,7 @@
copy audio track
-2-pass encode of a DVD to an MPEG-4 ("DivX") AVI while copying
+Two pass encode of a DVD to an MPEG-4 ("DivX") AVI while copying
the audio track.
mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o movie.avi
@@ -43,7 +43,7 @@
encode audio track
-2-pass encode of a DVD to an MPEG-4 ("DivX") AVI while encoding
+Two pass encode of a DVD to an MPEG-4 ("DivX") AVI while encoding
the audio track to MP3.
mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac mp3lame -lameopts vbr=3 -o movie.avi
@@ -393,7 +393,7 @@
-Copying two subtitles from a DVD while doing 2-pass encoding
+Copying two subtitles from a DVD while doing two pass encoding
rm subtitles.idx subtitles.sub
mencoder dvd://1 -oac copy -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -vobsubout subtitles -vobsuboutindex 0 -sid 2
@@ -559,11 +559,11 @@
-Constant Quantizer vs. 2-pass
+Constant Quantizer vs. two pass
There are three approaches to encoding the video: constant bitrate
- (CBR), constant quantizer, and two-pass (ABR, or average bitrate).
+ (CBR), constant quantizer, and two pass (ABR, or average bitrate).
@@ -615,7 +615,7 @@
- With a two-pass encode, the first pass will rip the movie as though it
+ With a two pass encode, the first pass will rip the movie as though it
were CBR, but it will keep a log of properties for each frame. This
data is then used during the second pass in order to make intelligent
decisions about which quantizers to use. During fast action or low
@@ -627,14 +627,14 @@
If you use , then you're wasting bits. If you
use , then you're not getting the highest
quality rip. Suppose you rip a DVD at , and
- the result is 1800Kbit. If you do a two-pass encode with
+ the result is 1800Kbit. If you do a two pass encode with
, the resulting video will have higher quality for the same
bitrate.
- Since you're now convinced that two-pass is the way to go, the real
+ Since you're now convinced that two pass is the way to go, the real
question now is what bitrate to use? The answer is that there's no
single answer. Ideally you want to choose a bitrate that yields the
best balance between quality and file size. This is going to vary
@@ -886,7 +886,7 @@
- We're now ready to do the 2-pass encode. Pass 1:
+ We're now ready to do the two pass encode. Pass 1:
mencoder dvd://1 -ofps 23.976 -oac copy -vf crop=720:352:0:62,hqdn3d=2:1:2 -ovc lavc \
-lavcopts vcodec=mpeg4:vbitrate=2400:v4mv:mbd=2:trell:cmp=3:subcmp=3:mbcmp=3:autoaspect:vpass=1 \