summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-16 06:55:31 +0000
committergabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-16 06:55:31 +0000
commit5595b15e5dc5c6bfbe2b592bf37ec3873ff65e89 (patch)
tree1a948c6e0c7152b8526a4a306ffa8e37c1fe9e59 /DOCS
parent0ca1de54dca690806adb4acb1354d245eccb0f75 (diff)
downloadmpv-5595b15e5dc5c6bfbe2b592bf37ec3873ff65e89.tar.bz2
mpv-5595b15e5dc5c6bfbe2b592bf37ec3873ff65e89.tar.xz
commiting yesterday's changes that accidently lost ;(((
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@473 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/VIDEOCARDS2
-rw-r--r--DOCS/mplayer.125
2 files changed, 20 insertions, 7 deletions
diff --git a/DOCS/VIDEOCARDS b/DOCS/VIDEOCARDS
index b9f2613379..3d81a94195 100644
--- a/DOCS/VIDEOCARDS
+++ b/DOCS/VIDEOCARDS
@@ -157,7 +157,7 @@ b, You want to use framebuffer...
read the framebuffer documentation in the kernel sources
(Documentation/fb/*) !
- ... but don't your card doesn't support VBE 2.0 standard (older ISA/PCI
+ ... but your card doesn't support VBE 2.0 standard (older ISA/PCI
cards, such as S3 Trio64) :
Well, VESAfb is still available, but you'll have to load SciTech Display
Doctor (formerly UniVBE) before booting Linux. Use a DOS boot disk or
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index cd75057ea8..8cf632533d 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -21,6 +21,8 @@ mplayer \- Movie Player for Linux
.RB [ \-mc\ seconds/5f ]
.RB [ \-afm\ audio\ decoder ]
.RB [ \-fs\ ]
+.RB [ \-vm\ ]
+.RB [ \-zoom\ ]
.RB [ \-x\ x ]
.RB [ \-y\ y ]
.RB [ \-xy\ factor ]
@@ -28,6 +30,8 @@ mplayer \- Movie Player for Linux
.RB [ \-pp\ quality ]
.RB [ \-include\ configfile ]
.RB [ \-ffactor\ number ]
+.RB [ \-sub\ file ]
+.RB [ \-subfps\ rate ]
.I file
.PP
.SH DESCRIPTION
@@ -60,12 +64,14 @@ play video cd track from device instead of plain file
don't play sound
.TP
.B \-fs
-fullscreen playing (only gl, xmga and xv drivers)
-
-.I NOTE
-The X11 driver doesn't support fullscreen and scaling.
-However, you can do it yourself, just press ALT,CTRL,-
-or ALT,CTRL,+ simultaneously, see X-server docs for details.
+fullscreen playing (centers movie, and makes black
+bands around it)
+.TP
+.B \-vm
+use XF86VidMode extension for mode changing
+.TP
+.B \-zoom
+use software scaling, where available
.TP
.B \-x\ x
scale image to x width [if driver suppports!]
@@ -101,6 +107,13 @@ resample alphamap of the font. Can be:
0.75 very narrow black outline [default]
1 narrow black outline
10 bold black outline
+.TP
+.B \-sub\ file
+use/display this subtitle file
+.TP
+.B \-subfps\ rate
+specify frame/sec rate of subtitle file
+(default: the same as the movie)
.IP
.SH "ADVANCED OPTIONS"
.TP