summaryrefslogtreecommitdiffstats
path: root/DOCS/man/en
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-16 02:39:58 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-16 02:39:58 +0200
commit0bf2bd91ec69dfd908d78557a17f38e0904a52e7 (patch)
treebf9e5e145ff802e7b5ff7b9ab387bfc3ba0331d7 /DOCS/man/en
parent738f66b1bc98073d74af7031c4454322157a15ec (diff)
parenteacf4421f4fe16674aefe8b628321188c4912521 (diff)
downloadmpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.bz2
mpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.xz
Merge svn changes up to r28610
Diffstat (limited to 'DOCS/man/en')
-rw-r--r--DOCS/man/en/mplayer.112
1 files changed, 6 insertions, 6 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index e4d517f0fa..d0920e4a45 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -2856,7 +2856,7 @@ file if no DVB card is installed.
.RSs
.IPs card=<1\-4>
DVB card to use if more than one card is present.
-If not specified mplayer will search the first usable card.
+If not specified MPlayer will search the first usable card.
.IPs file=<filename>
output filename
.RE
@@ -3560,13 +3560,13 @@ Mac OS X CoreVideo video output driver
.PD 0
.RSs
.IPs device_id=<number>
-Choose the display device to use for fullscreen or set it to \-1 to
+Choose the display device to use for fullscreen or set it to \-1 to
always use the same screen the video window is on (default: \-1 \- auto).
.IPs shared_buffer
-Write output to a shared memory buffer instead of displaying it and
+Write output to a shared memory buffer instead of displaying it and
try to open an existing NSConnection for communication with a GUI.
.IPs buffer_name=<name>
-Name of the shared buffer created with shm_open as well as the name of
+Name of the shared buffer created with shm_open as well as the name of
the NSConnection MPlayer will try to open (default: "mplayerosx").
Setting buffer_name implicitly enables shared_buffer.
.RE
@@ -4086,7 +4086,7 @@ if no DVB card is installed.
.IPs card=<1\-4>
Specifies the device number to use if you have more than one DVB output card
(V3 API only, such as 1.x.y series drivers).
-If not specified mplayer will search the first usable card.
+If not specified MPlayer will search the first usable card.
.IPs <filename>
output filename (default: ./grab.mpg)
.RE
@@ -6615,7 +6615,7 @@ Depending on the source MPEG, you may be fine ignoring this advice, as
long as you do not see lots of "Bottom-first field" warnings.
With no options it does normal inverse telecine, and should be used
together with mencoder \-fps 30000/1001 \-ofps 24000/1001.
-When this filter is used with mplayer, it will result in an uneven
+When this filter is used with MPlayer, it will result in an uneven
framerate during playback, but it is still generally better than using
pp=lb or no deinterlacing at all.
Multiple options can be specified separated by /.