From 52ba5ea684a353f7455df036fa0be1c8849d0de5 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 5 Jan 2011 14:55:45 +0000
Subject: example.conf: Disambiguate remarks about profiles

Also move the profiles to the bottom of the example configuration file
as the original remarks in the file suggested.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32754 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/example.conf | 34 +++++++++++++++++++---------------
 1 file changed, 19 insertions(+), 15 deletions(-)

(limited to 'etc')

diff --git a/etc/example.conf b/etc/example.conf
index 800e82be4e..3544ee9666 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -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
-- 
cgit v1.2.3