summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-05 16:52:51 +0000
committergabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-06-05 16:52:51 +0000
commit49ea21d07367275022349403cb4a60f8316e5634 (patch)
treec50f3db4fc020257dccf7d351f259196d67d8fb2
parent62ac7b8620efdd99d0bbfd7ce932f51eed7d2df6 (diff)
downloadmpv-49ea21d07367275022349403cb4a60f8316e5634.tar.bz2
mpv-49ea21d07367275022349403cb4a60f8316e5634.tar.xz
*** empty log message ***
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1038 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--DOCS/example.conf15
-rw-r--r--DOCS/mplayer.13
2 files changed, 12 insertions, 6 deletions
diff --git a/DOCS/example.conf b/DOCS/example.conf
index 577557eb02..bf4cb6733c 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -8,8 +8,11 @@
## more flexibly here. See below.
##
-vo=xv # To specify your default video output see -vo help for
- # valid settings
+vo=xv # To specify default video driver (see -vo help for
+ # list)
+
+ao=oss # To specify default audio driver (see -ao help for
+ # list)
fs=yes # Enlarges movie window to your desktop's size.
# Used by drivers: all
@@ -23,7 +26,7 @@ vm=no # Tries to change to a different videomode
# Used by drivers: fbdev, dga2, svga
zoom=no # Enable software scaling (powerful CPU needed)
- # Used by drivers: svga
+ # Used by drivers: svga, aalib
# x=800 # scale movie to <x> pixels width
# y=600 # scale movie to <y> pixels height
@@ -78,10 +81,12 @@ ffactor = 0.75
## SDL driver
##
+# vo = sdl # use SDL video driver by default
+# ao = sdl # use SDL audio driver by default
# sdl = aalib # specify driver to use (for ex.: aalib, dga, fbdev...)
-# noxv = yes # do not use XVideo hardware acceleration
+# noxv = no # whether to use XVideo hardware acceleration or not
# forcexv = yes # force XVideo even if not detected
-
+# sdla = esd # use SDL's ESD audio driver by default
# nodshow # disable usage of DirectShow video codecs
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 273b8bd1b0..016ebdbeed 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -155,7 +155,8 @@ specify frame/sec rate of subtitle file
delays subtitles by <sec> seconds. Can be negative.
.TP
.B \-osdlevel\ level
-specifies which mode the OSD should start in (none,seek,seek+timer)
+specifies which mode the OSD should start in (0 : none, 1 : seek, 2: seek+timer)
+(default = 2)
.IP
.SH "ADVANCED OPTIONS"
.TP