[Mplayer-cvslog] CVS: main/DOCS example.conf,1.26,1.27 mplayer.1,1.65,1.66

[Winner of tha face compo]

Update of /cvsroot/mplayer/main/DOCS
In directory mplayer:/var/tmp.root/cvs-serv27352/DOCS

Modified Files:
	example.conf mplayer.1 
Log Message:



Index: example.conf
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/example.conf,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- example.conf	4 Jul 2001 20:18:24 -0000	1.26
+++ example.conf	20 Jul 2001 16:58:55 -0000	1.27
@@ -27,7 +27,7 @@
 			# 2 = old method (0.17a)
 			# 3 = ICCCWM patch + Motif method
 
-vm=no			# Tries to change to a different videomode
+#vm=no			# Tries to change to a different videomode
 			# Used by drivers: dga2, x11, sdl
 
 #bpp=0			# Force changing display depth.
@@ -35,7 +35,7 @@
 			# may need 'vm=yes' too.
 			# Used by drivers: fbdev, dga2, svga
 
-zoom=no			# Enable software scaling (powerful CPU needed)
+#zoom=no		# Enable software scaling (powerful CPU needed)
 			# Used by drivers: svga, aalib
 
 # x=800			# scale movie to <x> pixels width
@@ -53,10 +53,10 @@
 ## You can also use spaces and/or tabs.
 ##
 
-sound	= 1
-nosound	= nein
-mixer	= /dev/mixer
-master	= no		# no : set PCM volume  	yes : set MASTER volume
+#sound		= 1
+#nosound	= nein
+#mixer		= /dev/mixer
+#master		= no		# no : set PCM volume  	yes : set MASTER volume
 
 ##
 ## resample the fonts' alphamap
@@ -66,7 +66,7 @@
 ## 10	bold black outline
 ##
 
-ffactor = 0.75
+#ffactor = 0.75
 
 ##
 ## FBdev driver: specify your monitor's timings, so resolutions
@@ -102,12 +102,20 @@
 # nodshow		# disable usage of DirectShow video codecs
 
 
-framedrop = yes		# drop frames, when not in sync (slow CPU, videocard,
+##
+## Other (preferred to be default from configfile) switches
+##
+
+framedrop 	= yes	# drop frames, when not in sync (slow CPU, videocard,
 			# etc)
 
+# vfm		= 5	# use libavcodec video codec family (you know,
+			# opensource DivX for example.. So preferred default on
+			# non-x86 boxes)
+
 ##
 ## You can also include other configfiles
 ## Specify full path!
 ##
 
-include = /home/gabucino/.mplayer/savage4.conf
+include = /home/gabucino/.mplayer/savage4.conf	# comment-me-out! :)

Index: mplayer.1
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/mplayer.1,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mplayer.1	20 Jul 2001 16:47:10 -0000	1.65
+++ mplayer.1	20 Jul 2001 16:58:55 -0000	1.66
@@ -191,17 +191,19 @@
 .TP
 .B \-vfm <1-5>
 force usage of a specific codec FAMILY. For example:
-    2 : use VFW (Win32) codecs
-    4 : use DirectShow (Win32) codecs
-    5 : use libavcodec codecs
+
+    -vfm 2         use VFW (Win32) codecs
+    -vfm 4         use DirectShow (Win32) codecs
+    -vfm 5         use libavcodec codecs
 .TP
 .B \-afm <1-5>
 force usage of a specific audio format. For example:
-    1 : MPEG
-    2 : PCM
-    3 : AC3
-    4 : Win32
-    5 : aLaw
+
+    -afm 1         use libmp3 (mp1/mp2/mp3)
+    -afm 2         suppose raw PCM audio
+    -afm 3         use libac3
+    -afm 4         use a matching Win32 codec
+    -afm 5         use aLaw/uLaw driver
 .TP
 .B \-sb\ position
 seek to byte position