summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorgabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-15 18:27:51 +0000
committergabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-04-15 18:27:51 +0000
commit77c23fbd26336f7d62b4db6842577c8573b3c271 (patch)
tree9ddb24bc612ba4d2fb75c2113b3a50adcdebb2ef /DOCS
parent223bda7194c6d4a876ac34a933483d5cfcf142ea (diff)
downloadmpv-77c23fbd26336f7d62b4db6842577c8573b3c271.tar.bz2
mpv-77c23fbd26336f7d62b4db6842577c8573b3c271.tar.xz
<this is an empty cvs comment ;>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@440 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/codecs.conf5
-rw-r--r--DOCS/mplayer.127
2 files changed, 24 insertions, 8 deletions
diff --git a/DOCS/codecs.conf b/DOCS/codecs.conf
index 7d831b3c48..d5cba433ca 100644
--- a/DOCS/codecs.conf
+++ b/DOCS/codecs.conf
@@ -146,11 +146,12 @@ videocodec wmv1
out BGR32,BGR24,BGR16,BGR15
videocodec ap41
- info "AngelPotion Definitive V1" ; yet another stolen stuff
+ info "AngelPotion Definitive V1 (really (MS MPEG-4 v3))" ; yet another stolen stuff
status working
fourcc AP41 div3
driver dshow
- dll "divx_c32.ax" ; no need to use apmpg4v1.dll
+ dll "divx_c32.ax" ; no need to use apmpg4v1.dll, it's only a
+ ; fuckin' wrapper..
guid 0x82CCd3E0, 0xF71A, 0x11D0, 0x9f, 0xe5, 0x00, 0x60, 0x97, 0x78, 0xaa, 0xaa
out YUY2
out BGR32,BGR24,BGR16,BGR15
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 969fe911a6..4f9644b828 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -28,6 +28,11 @@ mplayer \- Movie Player for Linux
.RB [ \-pp\ quality ]
.RB [ \-include\ configfile ]
.RB [ \-ffactor\ number ]
+.RB [ \-sub\ file ]
+.RB [ \-subfps\ rate ]
+.RB [ \-vm\ ]
+.RB [ \-zoom\ ]
+
.I file
.PP
.SH DESCRIPTION
@@ -60,12 +65,15 @@ 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 (with xv, xmga, gl, sdl, x11,
+fbdev drivers)
+.TP
+.B \-vm
+use the XF86VidMode extension (with x11, sdl, and dga1
+drivers, dga2 doesn't need this)
+.TP
+.B \-zoom
+use software scaling
.TP
.B \-x\ x
scale image to x width [if driver suppports!]
@@ -147,6 +155,13 @@ force usage of non-interleaved AVI parser
.TP
.B \-include
specify config file to be parsed after the default
+.TP
+.B \-sub
+specify subtitle file to display
+.TP
+.B \-subfps
+specify frame/sec rate of the subtitle file, in
+case it was autodetected wrong
.IP
.SH "ALPHA/BETA CODE"
.TP