[MPlayer-cvslog] CVS: main/etc example.conf,1.64,1.65

Diego Biurrun CVS syncmail at mplayerhq.hu
Tue Jan 17 00:58:39 CET 2006


CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/etc
In directory mail:/var2/tmp/cvs-serv1919

Modified Files:
	example.conf 
Log Message:
cosmetic whitespace / layout changes


Index: example.conf
===================================================================
RCS file: /cvsroot/mplayer/main/etc/example.conf,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- example.conf	16 Jan 2006 23:24:02 -0000	1.64
+++ example.conf	16 Jan 2006 23:58:37 -0000	1.65
@@ -1,130 +1,127 @@
-##
-## MPlayer configuration file
-##
-## Configuration files are read system-wide from /usr/local/etc/mplayer.conf
-## and per user from ~/.mplayer/config, where per-user settings override
-## system-wide settings, all of which are overrriden by the command line.
-##
-## The options are the same as on the command line without the preceding '-'.
-##
+#
+# MPlayer configuration file
+#
+# Configuration files are read system-wide from /usr/local/etc/mplayer.conf
+# and per user from ~/.mplayer/config, where per-user settings override
+# system-wide settings, all of which are overrriden by the command line.
+#
+# The options are the same as on the command line without the preceding '-'.
 
 
-##
-## video settings
-##
+#
+# video settings
+#
 
 # Specify default video driver (see -vo help for a list).
-# vo=xv
+#vo=xv
 
 # Specify default audio driver (see -ao help for a list).
-# ao=oss
+#ao=oss
 
 # fullscreen mode
-# fs=yes
+#fs=yes
 
 # Change to a different videomode when going fullscreen
 # (dga, x11, sdl video output drivers only).
-# vm=yes
+#vm=yes
 
 # Force changing display depth (valid settings are: 0, 15, 16, 24, 32).
 # May need 'vm=yes' as well, only works with fbdev, dga, svga, vesa
 # video output drivers.
-# bpp=0
+#bpp=0
 
 # Enable software scaling (powerful CPU needed).
 # Some video output drivers (svga, x11, vesa) do not support hardware scaling.
-# zoom=yes
+#zoom=yes
 
 # standard monitor size, with square pixels
-# monitoraspect=4:3
+#monitoraspect=4:3
 
 # Use this for a widescreen monitor, non-square pixels.
-# monitoraspect=16:9
+#monitoraspect=16:9
 
 # Makes the player window stay on top of all other windows.
-# ontop=yes
+#ontop=yes
+
+# Specify your preferred default skin here
+# (skins are searched for in /usr/local/share/mplayer/Skin/
+# and ~/.mplayer/Skin/).
+#
+#skin = Abyss
 
-##
-## Specify your preferred default skin here
-## (skins are searched for in /usr/local/share/mplayer/Skin/
-##  and ~/.mplayer/Skin/).
-##
-# skin = Abyss
-
-##
-## Multiple languages are available :)
-##
-## Hungarian	igen	nem
-## English		yes		no
-## German		ja		nein
-## Spanish		si		no
-## Polish		tak		nie
-## Swedish		ja		nej
-## Binary		1		0
-##
-## You can also use spaces and/or tabs.
-##
-
-# sound		= 1
-# nosound	= nein
-# mixer		= /dev/mixer
-
-##
-## resample the fonts' alphamap
-## 0	plain white fonts
-## 0.75	very narrow black outline (default)
-## 1	narrow black outline
-## 10	bold black outline
-##
-# ffactor = 0.75
-
-##
-## FBdev driver:
-##
+#
+# Multiple languages are available :)
+#
+# Hungarian	igen	nem
+# English	yes	no
+# German	ja	nein
+# Spanish	si	no
+# Polish	tak	nie
+# Swedish	ja	nej
+# Binary	1	0
+#
+# You can also use spaces and/or tabs.
+
+#sound = 1
+#nosound = nein
+#mixer = /dev/mixer
+
+#
+# resample the fonts' alphamap
+# 0     plain white fonts
+# 0.75  very narrow black outline (default)
+# 1     narrow black outline
+# 10    bold black outline
+#
+#ffactor = 0.75
+
+#
+# FBdev driver:
+#
 # mode to use (read from fb.modes)
-# fbmode = 640x480-120
+#fbmode = 640x480-120
 #
 # location of the fb.modes file
-# fbmodeconfig = /etc/fb.modes
+#fbmodeconfig = /etc/fb.modes
 
-## VESA and FBdev driver: Specify your monitor's timings.
-##
-## (see /etc/X11/XF86Config for timings)
-## ** CAUTION! IF YOUR DISPLAY DOESN'T SUPPORT AUTOMATICALLY TURNING OFF WHEN
-##    OVERDRIVED (AND EVEN IF IT DOES), THIS MAY CAUSE DAMAGE TO YOUR DISPLAY!
-##    WE AREN'T RESPONSIBLE, IT'S YOUR DECISION! **
-##
-## k, K: means multiply by 1000
-## m, M: means multiply by 1.000.000
-##
+# VESA and FBdev driver: Specify your monitor's timings.
+#
+# (see /etc/X11/XF86Config for timings)
+# ** CAUTION! IF YOUR DISPLAY DOESN'T SUPPORT AUTOMATICALLY TURNING OFF WHEN
+#    OVERDRIVED (AND EVEN IF IT DOES), THIS MAY CAUSE DAMAGE TO YOUR DISPLAY!
+#    WE AREN'T RESPONSIBLE, IT'S YOUR DECISION! **
+#
+# k, K: means multiply by 1000
+# m, M: means multiply by 1.000.000
+#
 # horizontal frequency range
-# monitor-hfreq = 31.5k-50k,70k
+#monitor-hfreq = 31.5k-50k,70k
 #
 # vertical frequency range
-# monitor-vfreq = 50-90
+#monitor-vfreq = 50-90
 #
 # dotclock (or pixelclock) range
-# monitor-dotclock = 30M-300M
+#monitor-dotclock = 30M-300M
 
-##
-## SDL driver
-##
+#
+# SDL driver
+#
 # Use SDL video with the aalib subdriver by default.
-# vo = sdl:aalib
+#vo = sdl:aalib
 #
 # Use SDL audio driver with the esd subdriver by default.
-# ao = sdl:esd
+#ao = sdl:esd
 
 
-##
-## Other (preferred to be default from configfile) switches
-##
+#
+# Other (preferred to be default from configfile) switches
+#
 # Drop frames to preserve audio/video sync.
-# framedrop = yes
+#framedrop = yes
 
-##
-## cache settings
-##
+#
+# cache settings
+#
 # Use 8MB input cache by default.
 #cache = 8192
 #
@@ -135,18 +132,17 @@
 #cache-seek-min = 50
 
 # DVD: Display English subtitles if available.
-# slang		= en
+#slang = en
 
 # DVD: Play English audio tracks if available.
-# alang		= en
+#alang = en
 
 
-## This is the correct way to use "subconfig" type options in the
-## configuration file. In the command line you use:
-## -af lavcresample=44100 , but here it is:
-# af=lavcresample=44100
+# This is the correct way to use "subconfig" type options in the
+# configuration file. In the command line you use:
+# -af lavcresample=44100 , but here it is:
+#af=lavcresample=44100
 
-##
-## You can also include other configfiles
-##
+#
+# You can also include other configfiles
 #include = /path/to/the/file/you/want/to/include




More information about the MPlayer-cvslog mailing list