summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authortorinthiel <torinthiel@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-23 23:20:42 +0000
committertorinthiel <torinthiel@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-12-23 23:20:42 +0000
commitc89de50ed13a9410d5f27235832798ace29e4aac (patch)
tree9c3fa8dd81464e69b57cdeca4ada6a2616122f89 /DOCS
parent70904c9204910c09ef5c736a9b8550383f635238 (diff)
downloadmpv-c89de50ed13a9410d5f27235832798ace29e4aac.tar.bz2
mpv-c89de50ed13a9410d5f27235832798ace29e4aac.tar.xz
Reformatting round continued
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21748 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/codecs.xml6
-rw-r--r--DOCS/xml/en/mencoder.xml8
-rw-r--r--DOCS/xml/en/radio.xml1
-rw-r--r--DOCS/xml/en/tvinput.xml2
-rw-r--r--DOCS/xml/en/usage.xml31
5 files changed, 24 insertions, 24 deletions
diff --git a/DOCS/xml/en/codecs.xml b/DOCS/xml/en/codecs.xml
index f392e5317e..24d60aa73f 100644
--- a/DOCS/xml/en/codecs.xml
+++ b/DOCS/xml/en/codecs.xml
@@ -671,9 +671,9 @@ Take a deep breath and start searching the registry...
Start <command>regedit</command>.
</para></step>
<step><para>
- Press <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>, disable the first two
- checkboxes, and enable the third. Type in the fourcc of the codec (e.g.
- <userinput>TM20</userinput>).
+ Press <keycombo><keycap>Ctrl</keycap><keycap>F</keycap></keycombo>, disable
+ the first two checkboxes, and enable the third. Type in the fourcc of the
+ codec (e.g. <userinput>TM20</userinput>).
</para></step>
<step><para>
You should see a field which contains the path and the filename (e.g.
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 25340a715f..9d788100f9 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -45,8 +45,7 @@ Audio Codecs:
</row>
<row>
<entry>lavc</entry>
- <entry>use one of <link linkend="menc-feat-enc-libavcodec-audio-codecs"><systemitem class="library">libavcodec</systemitem>'s audio codecs</link>
- </entry>
+ <entry>use one of <link linkend="menc-feat-enc-libavcodec-audio-codecs"><systemitem class="library">libavcodec</systemitem>'s audio codecs</link></entry>
</row>
<row>
<entry>faac</entry>
@@ -83,8 +82,7 @@ Video codecs:
<tbody>
<row>
<entry>lavc</entry>
- <entry>use one of <link linkend="menc-feat-enc-libavcodec-video-codecs"><systemitem class="library">libavcodec</systemitem>'s video codecs</link>
- </entry>
+ <entry>use one of <link linkend="menc-feat-enc-libavcodec-video-codecs"><systemitem class="library">libavcodec</systemitem>'s video codecs</link></entry>
</row>
<row>
<entry>xvid</entry>
@@ -413,6 +411,7 @@ Note that you can set the title of the video with
<sect1 id="menc-feat-mpeg">
<title>Encoding to MPEG format</title>
+
<para>
<application>MEncoder</application> can create MPEG (MPEG-PS) format output
files.
@@ -731,6 +730,7 @@ mencoder <replaceable>movie.mpg</replaceable> -ifo <replaceable>movie.ifo</repla
<sect1 id="aspect">
<title>Preserving aspect ratio</title>
+
<para>
DVDs and SVCDs (i.e. MPEG-1/2) files contain an aspect ratio value, which
describes how the player should scale the video stream, so humans will not
diff --git a/DOCS/xml/en/radio.xml b/DOCS/xml/en/radio.xml
index 8150c8c449..009d3b47ba 100644
--- a/DOCS/xml/en/radio.xml
+++ b/DOCS/xml/en/radio.xml
@@ -38,6 +38,7 @@ description of radio options and keyboard controls.
<para>
The full listing of the options is available in the manual page.
Here are just a few tips:
+
<itemizedlist>
<listitem><para>
Use the <option>channels</option> option. An example:
diff --git a/DOCS/xml/en/tvinput.xml b/DOCS/xml/en/tvinput.xml
index 8da1a8e807..791e8d81cf 100644
--- a/DOCS/xml/en/tvinput.xml
+++ b/DOCS/xml/en/tvinput.xml
@@ -39,7 +39,6 @@ of TV options and keyboard controls.
<para>
The full listing of the options is available on the manual page.
Here are just a few tips:
-</para>
<itemizedlist>
<listitem><para>
@@ -133,6 +132,7 @@ Here are just a few tips:
check the "full duplex" option in the sound server preference menu.
</para></listitem>
</itemizedlist>
+</para>
</sect2>
<!-- ********** -->
diff --git a/DOCS/xml/en/usage.xml b/DOCS/xml/en/usage.xml
index 4337bb74d7..5aafc99319 100644
--- a/DOCS/xml/en/usage.xml
+++ b/DOCS/xml/en/usage.xml
@@ -105,9 +105,6 @@ mplayer -abs 65536 -delay -0.4 -nobps <replaceable>~/movies/test.avi</replaceabl
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
<sect1 id="subosd">
<title>Subtitles and OSD</title>
@@ -237,9 +234,6 @@ About DVD subtitles, read the <link linkend="dvd">DVD</link> section.
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-
<sect1 id="control">
<title>Control</title>
@@ -371,7 +365,6 @@ The commands are documented in the
</sect2>
</sect1>
-<!-- ********** -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -388,20 +381,26 @@ HTTP, FTP, MMS or RTSP/RTP protocol.
Playing works simply by passing the URL on the command line.
<application>MPlayer</application> honors the <envar>http_proxy</envar>
environment variable, using a proxy if available. Proxies can also be forced:
-<screen>mplayer <replaceable>http_proxy://proxy.micorsops.com:3128/http://micorsops.com:80/stream.asf</replaceable></screen>
+<screen>
+mplayer <replaceable>http_proxy://proxy.micorsops.com:3128/http://micorsops.com:80/stream.asf</replaceable>
+</screen>
</para>
<para>
<application>MPlayer</application> can read from stdin
(<emphasis>not</emphasis> named pipes). This can for example be used to
play from FTP:
-<screen>wget <replaceable>ftp://micorsops.com/something.avi</replaceable> -O - | mplayer -</screen>
+<screen>
+wget <replaceable>ftp://micorsops.com/something.avi</replaceable> -O - | mplayer -
+</screen>
</para>
<note><para>
It is also recommended to enable <option>-cache</option> when playing
from the network:
-<screen>wget <replaceable>ftp://micorsops.com/something.avi</replaceable> -O - | mplayer -cache 8192 -</screen>
+<screen>
+wget <replaceable>ftp://micorsops.com/something.avi</replaceable> -O - | mplayer -cache 8192 -
+</screen>
</para></note>
<!-- ********** -->
@@ -426,7 +425,6 @@ This works with all protocols supported by
</sect2>
</sect1>
-<!-- ********** -->
<!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -636,7 +634,7 @@ your equipment supports.
<itemizedlist>
<title>To enable passthrough in the <application>MPlayer</application>
-configuration file: </title>
+ configuration file: </title>
<listitem><para>
For AC3 only, use <option>ac=hwac3,</option>
</para></listitem>
@@ -652,9 +650,10 @@ configuration file: </title>
Note that there is a comma (",") at the end of
<option>ac=hwac3,</option> and <option>ac=hwdts,</option>. This will make
<application>MPlayer</application> fall back on the codecs it normally uses when
-playing a file that does not have AC3 or DTS audio. <option>afm=hwac3</option>
-does not need a comma; <application>MPlayer</application> will fall back anyway
-when an audio family is specified.
+playing a file that does not have AC3 or DTS audio.
+<option>afm=hwac3</option> does not need a comma;
+<application>MPlayer</application> will fall back anyway when an audio family
+is specified.
</para>
</sect3>
@@ -893,7 +892,7 @@ channel 2 --> channel 2<!--
Write out the channel copies as pairs of suboptions. Note that the first
channel is 0, the second is 1, etc. The order of these suboptions does not
matter as long as they are properly grouped into
-<replaceable>source:destination</replaceable> pairs.
+ <replaceable>source:destination</replaceable> pairs.
</para></listitem>
</orderedlist>
</para>