*** empty log message ***

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1365 b3059339-0415-0410-9bf9-f77b7e298cf2

3 files changed, 28 insertions, 18 deletions

diff --git a/DOCS/Hungarian/DVD-FAQ b/DOCS/Hungarian/DVD-FAQ
index 316bade442..46c6e685da 100644
--- a/DOCS/Hungarian/DVD-FAQ
+++ b/DOCS/Hungarian/DVD-FAQ
@@ -24,7 +24,7 @@ Q: A DVD támogatás MPlayer-ben lószar!
 A: Igazad van :) Ha tudsz rajta javítani, lépj velünk kapcsolatba!
 
 Q: Honnan tudom letölteni a libcss-t?
-A: Talán az OMS forrásából (www.livid.org).
+A: Talán az OMS forrásából (www.linuxvideo.org).
 
 Q: Hogy lehet... (képzeld ide azt, ami leginkább kellene neked DVD-hez)
 A: Jelenleg csak lejátszani lehet DVD-ről. Semmi több.
diff --git a/DOCS/example.conf b/DOCS/example.conf
index f003aab481..e3bcec9b84 100644
--- a/DOCS/example.conf
+++ b/DOCS/example.conf
@@ -27,7 +27,7 @@ fs=yes			# Enlarges movie window to your desktop's size.
 			# 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 @@ vm=no			# Tries to change to a different videomode
 			# 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 @@ zoom=no			# Enable software scaling (powerful CPU needed)
 ## 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 @@ master	= no		# no : set PCM volume  	yes : set MASTER volume
 ## 10	bold black outline
 ##
 
-ffactor = 0.75
+#ffactor = 0.75
 
 ##
 ## FBdev driver: specify your monitor's timings, so resolutions
@@ -102,12 +102,20 @@ ffactor = 0.75
 # 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! :)
diff --git a/DOCS/mplayer.1 b/DOCS/mplayer.1
index 9b1dbf5b9c..0bb3343185 100644
--- a/DOCS/mplayer.1
+++ b/DOCS/mplayer.1
@@ -191,17 +191,19 @@ for example :
 .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