# HG changeset patch
# User torinthiel
# Date 1166916042 0
# Node ID 893e314fff49b903dfac738bfd2accf1a5d88713
# Parent 61c0bae18c2361637d8ac4685fe5b1b331321cbc
Reformatting round continued
diff -r 61c0bae18c23 -r 893e314fff49 DOCS/xml/en/codecs.xml
--- a/DOCS/xml/en/codecs.xml Sat Dec 23 23:13:11 2006 +0000
+++ b/DOCS/xml/en/codecs.xml Sat Dec 23 23:20:42 2006 +0000
@@ -671,9 +671,9 @@
Start regedit.
- Press CtrlF, disable the first two
- checkboxes, and enable the third. Type in the fourcc of the codec (e.g.
- TM20).
+ Press CtrlF, disable
+ the first two checkboxes, and enable the third. Type in the fourcc of the
+ codec (e.g. TM20).
You should see a field which contains the path and the filename (e.g.
diff -r 61c0bae18c23 -r 893e314fff49 DOCS/xml/en/mencoder.xml
--- a/DOCS/xml/en/mencoder.xml Sat Dec 23 23:13:11 2006 +0000
+++ b/DOCS/xml/en/mencoder.xml Sat Dec 23 23:20:42 2006 +0000
@@ -45,8 +45,7 @@
lavc
- use one of libavcodec's audio codecs
-
+ use one of libavcodec's audio codecsfaac
@@ -83,8 +82,7 @@
lavc
- use one of libavcodec's video codecs
-
+ use one of libavcodec's video codecsxvid
@@ -413,6 +411,7 @@
Encoding to MPEG format
+
MEncoder can create MPEG (MPEG-PS) format output
files.
@@ -731,6 +730,7 @@
Preserving aspect ratio
+
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 -r 61c0bae18c23 -r 893e314fff49 DOCS/xml/en/radio.xml
--- a/DOCS/xml/en/radio.xml Sat Dec 23 23:13:11 2006 +0000
+++ b/DOCS/xml/en/radio.xml Sat Dec 23 23:20:42 2006 +0000
@@ -38,6 +38,7 @@
The full listing of the options is available in the manual page.
Here are just a few tips:
+
Use the option. An example:
diff -r 61c0bae18c23 -r 893e314fff49 DOCS/xml/en/tvinput.xml
--- a/DOCS/xml/en/tvinput.xml Sat Dec 23 23:13:11 2006 +0000
+++ b/DOCS/xml/en/tvinput.xml Sat Dec 23 23:20:42 2006 +0000
@@ -39,7 +39,6 @@
The full listing of the options is available on the manual page.
Here are just a few tips:
-
@@ -133,6 +132,7 @@
check the "full duplex" option in the sound server preference menu.
+
diff -r 61c0bae18c23 -r 893e314fff49 DOCS/xml/en/usage.xml
--- a/DOCS/xml/en/usage.xml Sat Dec 23 23:13:11 2006 +0000
+++ b/DOCS/xml/en/usage.xml Sat Dec 23 23:20:42 2006 +0000
@@ -105,9 +105,6 @@
-
-
-
Subtitles and OSD
@@ -237,9 +234,6 @@
-
-
-
Control
@@ -371,7 +365,6 @@
-
@@ -388,20 +381,26 @@
Playing works simply by passing the URL on the command line.
MPlayer honors the http_proxy
environment variable, using a proxy if available. Proxies can also be forced:
-mplayer http_proxy://proxy.micorsops.com:3128/http://micorsops.com:80/stream.asf
+
+mplayer http_proxy://proxy.micorsops.com:3128/http://micorsops.com:80/stream.asf
+MPlayer can read from stdin
(not named pipes). This can for example be used to
play from FTP:
-wget ftp://micorsops.com/something.avi -O - | mplayer -
+
+wget ftp://micorsops.com/something.avi -O - | mplayer -
+
It is also recommended to enable when playing
from the network:
-wget ftp://micorsops.com/something.avi -O - | mplayer -cache 8192 -
+
+wget ftp://micorsops.com/something.avi -O - | mplayer -cache 8192 -
+
@@ -426,7 +425,6 @@
-
@@ -636,7 +634,7 @@
To enable passthrough in the MPlayer
-configuration file:
+ configuration file:
For AC3 only, use
@@ -652,9 +650,10 @@
Note that there is a comma (",") at the end of
and . This will make
MPlayer fall back on the codecs it normally uses when
-playing a file that does not have AC3 or DTS audio.
-does not need a comma; MPlayer will fall back anyway
-when an audio family is specified.
+playing a file that does not have AC3 or DTS audio.
+ does not need a comma;
+MPlayer will fall back anyway when an audio family
+is specified.
@@ -893,7 +892,7 @@
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
-source:destination pairs.
+ source:destination pairs.