summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-13 20:31:30 +0000
committergpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-10-13 20:31:30 +0000
commitcda04170cc5bbb3204eba96be7bb0156fc5b5c31 (patch)
tree9dac2e01f77cdf7d42241028321c3043f12cc032 /DOCS
parent91117f5372667330425cb5b934646523b3e210ee (diff)
downloadmpv-cda04170cc5bbb3204eba96be7bb0156fc5b5c31.tar.bz2
mpv-cda04170cc5bbb3204eba96be7bb0156fc5b5c31.tar.xz
fixes suggested by Diego and Alex
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16755 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/mencoder.xml18
1 files changed, 9 insertions, 9 deletions
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index be6c5ef10e..1ee8b0c574 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -134,7 +134,7 @@ Container formats:
</row>
<row>
<entry>avi</entry>
- <entry>Audio-Video Interleave</entry>
+ <entry>Audio-Video Interleaved</entry>
</row>
<row>
<entry>mpeg</entry>
@@ -156,7 +156,7 @@ Container formats:
is best handled, and the one for which <application>MEncoder</application>
was designed.
As noted above, other container formats are usable, but you may
- experience some problems when using them.
+ experience problems when using them.
</para>
<para>
@@ -187,7 +187,7 @@ Container formats:
</row>
<row>
<entry>avi</entry>
- <entry>Audio-Video Interleave</entry>
+ <entry>Audio-Video Interleaved</entry>
</row>
<row>
<entry>wav</entry>
@@ -203,7 +203,7 @@ Container formats:
</row>
<row>
<entry>rm</entry>
- <entry>RealAudio and RealVideo</entry>
+ <entry>RealMedia</entry>
</row>
<row>
<entry>au</entry>
@@ -229,12 +229,12 @@ Container formats:
</tgroup>
</informaltable>
As you can see, <systemitem class="library">libavformat</systemitem>
- allows <application>MEncoder</application> to mux into a considerable
+ allows <application>MEncoder</application> muxing into a considerable
variety of containers.
Unfortunately, as <application>MEncoder</application> was not designed
- from the beginning to support other container formats than AVI,
+ from the beginning to support container formats other than AVI,
your should really be paranoid about the resulting file.
- Please check to be sure that the audio/video synchronization is okay
+ Please check to be sure that the audio/video synchronization is OK
and that the file can be played correctly by players other than
<application>MPlayer</application>.
</para>
@@ -242,10 +242,10 @@ Container formats:
<informalexample>
<para>Example:</para>
<para>
- Creating a Macromedia Flash video suitable to be played in a web browser
+ Creating a Macromedia Flash video suitable for playback in a web browser
with the Macromedia Flash plugin:
<screen>
-mencoder <replaceable>input.avi</replaceable> -o <replaceable>ouput.flv</replaceable> -of lavf -oac mp3lame -lameopts abr:br=56 -ovc lavc \
+mencoder <replaceable>input.avi</replaceable> -o <replaceable>output.flv</replaceable> -of lavf -oac mp3lame -lameopts abr:br=56 -ovc lavc \
-lavcopts vcodec=flv:vbitrate=500:mbd=2:mv0:trell:v4mv:cbp:last_pred=3 \
-srate 22050
</screen>