summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-07 22:33:01 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-07 22:33:01 +0000
commite017a5df48b1ed34a39fc57d3234f2659d76125f (patch)
treebe2c2af27fd03d83aa87f519b63c623e65046d0b /DOCS
parent701956fffff0cdda3d270628d087ba6722b57559 (diff)
downloadmpv-e017a5df48b1ed34a39fc57d3234f2659d76125f.tar.bz2
mpv-e017a5df48b1ed34a39fc57d3234f2659d76125f.tar.xz
consistent "two pass" spelling
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14422 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/documentation.xml2
-rw-r--r--DOCS/xml/en/install.xml4
-rw-r--r--DOCS/xml/en/mencoder.xml22
3 files changed, 14 insertions, 14 deletions
diff --git a/DOCS/xml/en/documentation.xml b/DOCS/xml/en/documentation.xml
index d8ec85c173..b3e61ee38e 100644
--- a/DOCS/xml/en/documentation.xml
+++ b/DOCS/xml/en/documentation.xml
@@ -95,7 +95,7 @@ Encoder) is a simple movie encoder, designed to encode
(<emphasis role="bold">AVI/ASF/OGG/DVD/VCD/VOB/MPG/MOV/VIV/FLI/RM/NUV/NET/PVA</emphasis>)
to other <application>MPlayer</application>-playable formats (see below). It
can encode with various codecs, like <emphasis role="bold">MPEG-4 (DivX4)</emphasis>
-(1 or 2 passes), <systemitem class="library">libavcodec</systemitem>,
+(one or two passes), <systemitem class="library">libavcodec</systemitem>,
<emphasis role="bold">PCM/MP3/VBR MP3</emphasis>
audio.
</para>
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 03cfca2d98..3eaa3f136d 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -205,7 +205,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
and encoding. Features:
<itemizedlist>
<listitem><simpara>
- 1 pass or 2 pass encoding with
+ one pass or two pass encoding with
<link linkend="mencoder"><application>MEncoder</application></link>
</simpara></listitem>
<listitem><simpara>
@@ -223,7 +223,7 @@ You need a fairly recent system. On Linux, 2.4.x kernels are recommended.
DivX4Linux. Features:
<itemizedlist>
<listitem><simpara>
- 1 pass or 2 pass encoding with
+ one pass or two pass encoding with
<link linkend="mencoder"><application>MEncoder</application></link>
</simpara></listitem>
<listitem><simpara>
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 432adaae13..98497ff7ba 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -15,13 +15,13 @@ encoding with <application>MEncoder</application>.
</para>
<sect1 id="menc-feat-mpeg4">
-<title>Encoding 2-pass MPEG-4 (&quot;DivX&quot;)</title>
+<title>Encoding two pass MPEG-4 (&quot;DivX&quot;)</title>
<para>
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). 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 @@ net.
<example>
<title>copy audio track</title>
<para>
-2-pass encode of a DVD to an MPEG-4 (&quot;DivX&quot;) AVI while copying
+Two pass encode of a DVD to an MPEG-4 (&quot;DivX&quot;) AVI while copying
the audio track.
<screen>
mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac copy -o <replaceable>movie.avi</replaceable>
@@ -43,7 +43,7 @@ mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=2 -oac copy -o <replacea
<example>
<title>encode audio track</title>
<para>
-2-pass encode of a DVD to an MPEG-4 (&quot;DivX&quot;) AVI while encoding
+Two pass encode of a DVD to an MPEG-4 (&quot;DivX&quot;) AVI while encoding
the audio track to MP3.
<screen>
mencoder dvd://2 -ovc lavc -lavcopts vcodec=mpeg4:vpass=1 -oac mp3lame -lameopts vbr=3 -o <replaceable>movie.avi</replaceable>
@@ -393,7 +393,7 @@ before starting.
</para>
<example>
-<title>Copying two subtitles from a DVD while doing 2-pass encoding</title>
+<title>Copying two subtitles from a DVD while doing two pass encoding</title>
<screen>
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 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
</para>
<sect2 id="menc-feat-dvd-mpeg4-2pass">
-<title>Constant Quantizer vs. 2-pass</title>
+<title>Constant Quantizer vs. two pass</title>
<para>
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).
</para>
<para>
@@ -615,7 +615,7 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
</para>
<para>
- 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 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
If you use <option>vqscale=2</option>, then you're wasting bits. If you
use <option>vqscale=3</option>, then you're not getting the highest
quality rip. Suppose you rip a DVD at <option>vqscale=3</option>, 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
<option>vbitrate=1800</option>, the resulting video will have <emphasis
role="bold">higher quality</emphasis> for the <emphasis role="bold">same
bitrate</emphasis>.
</para>
<para>
- 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 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
</para>
<para>
- We're now ready to do the 2-pass encode. Pass 1:
+ We're now ready to do the two pass encode. Pass 1:
<screen>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 \