# HG changeset patch
# User gabucino
# Date 987431467 0
# Node ID 5bf4b70bd66a8151a3dfa03e413347ed603453ba
# Parent  ce84c478e9e5b9286fdef7ff825803663aac5b4b
some options fixed

diff -r ce84c478e9e5 -r 5bf4b70bd66a DOCS/example.conf
--- a/DOCS/example.conf	Mon Apr 16 10:22:34 2001 +0000
+++ b/DOCS/example.conf	Mon Apr 16 14:31:07 2001 +0000
@@ -12,7 +12,6 @@
 			# valid settings
 
 fs=yes			# Enlarges movie window to your desktop's size.
-			# (even for SVGAlib!)
 			# Used by drivers: all
 
 vm=no			# Tries to change to a different videomode
@@ -26,8 +25,8 @@
 zoom=no			# Enable software scaling (powerful CPU needed)
 			# Used by drivers: svga, (sdl - why not?)
 
-# x=TODO
-# y=TODO
+# x=800			# scale movie to <x> width 
+# y=600			# scale movie to <y> height
 
 ##
 ## Multiple languages are available :)
@@ -44,7 +43,7 @@
 sound	= 1
 nosound	= nein
 mixer	= /dev/mixer
-master	= no		# no : PCM volume  	yes : MASTER volume
+master	= no		# no : set PCM volume  	yes : set MASTER volume
 
 ##
 ## Remember the -noalsa switch ? You can specify it either with:
diff -r ce84c478e9e5 -r 5bf4b70bd66a DOCS/mplayer.1
--- a/DOCS/mplayer.1	Mon Apr 16 10:22:34 2001 +0000
+++ b/DOCS/mplayer.1	Mon Apr 16 14:31:07 2001 +0000
@@ -194,6 +194,8 @@
 / or *          decrease/increase volume
 
 o               toggle OSD:  none / seek / seek+timer
+
+m or c          use mixer master or pcm channel
 .IP
 .SH FILES AND DIRECTORIES
 .TP