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
This commit is contained in:
diego 2011-01-05 14:55:45 +00:00 committed by Uoti Urpala
parent 74c285e090
commit 52ba5ea684
1 changed files with 19 additions and 15 deletions

View File

@ -2,7 +2,7 @@
# MPlayer configuration file # MPlayer configuration file
# #
# Configuration files are read system-wide from /usr/local/etc/mplayer.conf # 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. # system-wide settings, all of which are overrriden by the command line.
# #
# The configuration file settings are the same as 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 # See the CONFIGURATION FILES section in the man page
# for a detailed description of the syntax. # for a detailed description of the syntax.
# #
# Profiles should be at the bottom of the config file to ensure you dont # Profiles should be placed at the bottom of the configuration file to ensure
# put default options under profiles accidentally. # that settings wanted as defaults are not restricted to specific profiles.
################## ##################
# video settings # # 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). # Specify default video driver (see -vo help for a list).
#vo=xv #vo=xv
@ -98,6 +89,7 @@
#ao=alsa:device=spdif #ao=alsa:device=spdif
#ac=hwac3,hwdts,hwmpa, #ac=hwac3,hwdts,hwmpa,
################## ##################
# other settings # # other settings #
################## ##################
@ -149,13 +141,25 @@
# DVD: Play English audio tracks if available. # DVD: Play English audio tracks if available.
#alang = en #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] [protocol.dvdnav]
#vc=ffmpeg12, #vc=ffmpeg12,
#mouse-movements=yes #mouse-movements=yes
#nocache=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. # You can also include other configuration files.
#include = /path/to/the/file/you/want/to/include #include = /path/to/the/file/you/want/to/include