changeset 32667:e47b15813eba

Disambiguate remarks about profiles in configuration files. Also move the profiles to the bottom of the example configuration file as the original remarks in the file suggested.
author diego
date Wed, 05 Jan 2011 14:55:45 +0000
parents 16b259cea7ae
children cb671a73f3a3
files etc/example.conf
diffstat 1 files changed, 19 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/etc/example.conf	Wed Jan 05 13:55:44 2011 +0000
+++ b/etc/example.conf	Wed Jan 05 14:55:45 2011 +0000
@@ -2,7 +2,7 @@
 # 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
+# and per-user from ~/.mplayer/config, where per-user settings override
 # system-wide settings, all of which are overrriden by the command line.
 #
 # The configuration file settings are the same as the command line
@@ -11,23 +11,14 @@
 # See the CONFIGURATION FILES section in the man page
 # for a detailed description of the syntax.
 #
-# Profiles should be at the bottom of the config file to ensure you dont
-# put default options under profiles accidentally.
+# Profiles should be placed at the bottom of the configuration file to ensure
+# that settings wanted as defaults are not restricted to specific profiles.
 
 
 ##################
 # video settings #
 ##################
 
-# Specify vdpau codecs when using -vo vdpau.
-#[vo.vdpau]
-#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
-# Most video filters do not work with vdpau.
-#vf-clr=yes
-
-# Make sure options under vo.vdpau profile are counted when vdpau is not used
-#[default]
-
 # Specify default video driver (see -vo help for a list).
 #vo=xv
 
@@ -98,6 +89,7 @@
 #ao=alsa:device=spdif
 #ac=hwac3,hwdts,hwmpa,
 
+
 ##################
 # other settings #
 ##################
@@ -149,13 +141,25 @@
 # DVD: Play English audio tracks if available.
 #alang = en
 
-###################
-# DVDNAV Settings #
-###################
+
+############
+# Profiles #
+############
+
+# The options declared as part of profiles override global default settings,
+# but only take effect when the profile is active.
+
 [protocol.dvdnav]
 #vc=ffmpeg12,
 #mouse-movements=yes
 #nocache=yes
 
+#[vo.vdpau]
+#vc=ffmpeg12vdpau,ffwmv3vdpau,ffvc1vdpau,ffh264vdpau,ffodivxvdpau,
+# Most video filters do not work with vdpau.
+#vf-clr=yes
+
+
+
 # You can also include other configuration files.
 #include = /path/to/the/file/you/want/to/include