diff options
author | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-20 12:05:50 +0000 |
---|---|---|
committer | gabucino <gabucino@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-04-20 12:05:50 +0000 |
commit | 79ff293198f1aa33d9b9e20862a2c4851e4d8779 (patch) | |
tree | efcf7bff44b8036dbf0e146162c98bb82de5e3b2 /DOCS/mplayer.1 | |
parent | 4a47e6a975f8ab32ce783345bd13496017c923f4 (diff) | |
download | mpv-79ff293198f1aa33d9b9e20862a2c4851e4d8779.tar.bz2 mpv-79ff293198f1aa33d9b9e20862a2c4851e4d8779.tar.xz |
applied Holm's patch
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5727 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS/mplayer.1')
-rw-r--r-- | DOCS/mplayer.1 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1 index 568b564a35..6e01e66c94 100644 --- a/DOCS/mplayer.1 +++ b/DOCS/mplayer.1 @@ -155,10 +155,6 @@ Used in combination with \-nosound and \-vo null for benchmarking only video cod .B \-cdrom\-device\ <path\ to\ device> Override default CDROM drive name /dev/cdrom .TP -.B \-conf\ <path\ to\ input.conf\ file> -Get input bindings from an alternative input.conf file (default: -~/.mplayer/input.conf). -.TP .B \-dr Turns on direct rendering (not supported by all codecs and video outputs) (default is off). @@ -370,9 +366,6 @@ Select number of audio output channels to be used Currently this option is only honoured for AC3 audio. .TP -.B \-config <config\ file> -Specifies where to search for config file -.TP .B \-contrast <\-1000\ \-\ 1000> Adjust contrast of video output (default 0). Works in similar manner as brightness. .TP @@ -484,6 +477,9 @@ This option can be used to configure certain parts of the input system. bound to cmdlist prints all commands that can be bound + js-dev specifies the joystick device + to use + (default is /dev/input/js0) .I NOTE: Autorepeat is currently only supported by joysticks. @@ -810,7 +806,9 @@ S select .SH "SLAVE MODE PROTOCOL" If the \-slave switch is given, playback is controlled by a -line\-based protocol with the following tokens: +line\-based protocol. If the new input is enabled (default) +each line must contain one command otherwise one of the +following tokens: .TP stop pause playback .br |