From c89de50ed13a9410d5f27235832798ace29e4aac Mon Sep 17 00:00:00 2001 From: torinthiel Date: Sat, 23 Dec 2006 23:20:42 +0000 Subject: Reformatting round continued git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21748 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/xml/en/codecs.xml | 6 +++--- DOCS/xml/en/mencoder.xml | 8 ++++---- DOCS/xml/en/radio.xml | 1 + DOCS/xml/en/tvinput.xml | 2 +- DOCS/xml/en/usage.xml | 31 +++++++++++++++---------------- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'DOCS/xml') 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 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 --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: lavc - use one of libavcodec's audio codecs - + use one of libavcodec's audio codecs faac @@ -83,8 +82,7 @@ Video codecs: lavc - use one of libavcodec's video codecs - + use one of libavcodec's video codecs xvid @@ -413,6 +411,7 @@ Note that you can set the title of the video with Encoding to MPEG format + MEncoder can create MPEG (MPEG-PS) format output files. @@ -731,6 +730,7 @@ mencoder movie.mpg -ifo movie.ifo 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 --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. The full listing of the options is available in the manual page. Here are just a few tips: + Use the 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. The full listing of the options is available on the manual page. Here are just a few tips: - @@ -133,6 +132,7 @@ Here are just a few tips: check the "full duplex" option in the sound server preference menu. + 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 ~/movies/test.avi - - - Subtitles and OSD @@ -237,9 +234,6 @@ About DVD subtitles, read the DVD section. - - - Control @@ -371,7 +365,6 @@ The commands are documented in the - @@ -388,20 +381,26 @@ HTTP, FTP, MMS or RTSP/RTP protocol. 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 @@ This works with all protocols supported by - @@ -636,7 +634,7 @@ your equipment supports. To enable passthrough in the <application>MPlayer</application> -configuration file: + configuration file: For AC3 only, use @@ -652,9 +650,10 @@ configuration file: 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 @@ channel 2 --> channel 2