summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-02-08 13:49:47 +0100
committerwm4 <wm4@nowhere>2016-02-08 13:49:47 +0100
commit5d0c89a03995e2572f2ff23a6dc6a3a19a8213ad (patch)
tree794d3bb203aea479d792ebd4cf358ac486baea25
parent9f6dfaabf99b29b1b9caaf9e2a97128964a01b05 (diff)
downloadmpv-5d0c89a03995e2572f2ff23a6dc6a3a19a8213ad.tar.bz2
mpv-5d0c89a03995e2572f2ff23a6dc6a3a19a8213ad.tar.xz
mpv.conf: adjustments
In particular, get rid of the "vdpau" example profile, as it's pretty useless and misleading.
-rw-r--r--etc/mpv.conf55
1 files changed, 32 insertions, 23 deletions
diff --git a/etc/mpv.conf b/etc/mpv.conf
index 7a85de615b..d54d14cc2e 100644
--- a/etc/mpv.conf
+++ b/etc/mpv.conf
@@ -1,5 +1,12 @@
#
-# mpv configuration file
+# Example mpv configuration file
+#
+# Warning:
+#
+# The commented example options usually do _not_ set the default values. Call
+# mpv with --list-options to see the default values for most options. There is
+# no builtin or example mpv.conf with all the defaults.
+#
#
# Configuration files are read system-wide from /usr/local/etc/mpv.conf
# and per-user from ~/.config/mpv/mpv.conf, where per-user settings override
@@ -17,18 +24,11 @@
#
# Profiles should be placed at the bottom of the configuration file to ensure
# that settings wanted as defaults are not restricted to specific profiles.
-#
-# Note that the commented example options usually do _not_ set the default
-# values. Calling mpv with --list-options is a nice way to see the default
-# values for most options.
##################
# video settings #
##################
-# Specify default video driver (see --vo=help for a list).
-#vo=opengl-hq
-
# Start in fullscreen mode by default.
#fs=yes
@@ -44,6 +44,22 @@
# Keep the player window on top of all other windows.
#ontop=yes
+# Specify default video driver (see --vo=help for a list).
+# This one selects high quality video scaling etc. - can cause problems with
+# some drivers and GPUs.
+#vo=opengl-hq
+
+# Force video to lock on the display's refresh rate, and change video and audio
+# speed to some degree to ensure synchronous playback - can cause problems
+# with some drivers and desktop environments.
+#video-sync=display-resample
+
+# Enable hardware decoding if available. Often, this does not work with all
+# video outputs, but should work well with default settings on most systems.
+# If performance or energy usage is an issue, forcing the vdpau or vaapi VOs
+# may or may not help.
+#hwdec=auto
+
##################
# audio settings #
##################
@@ -100,9 +116,10 @@ audio-pitch-correction=no
# If the file seems to be valid UTF-8, prefer UTF-8.
#sub-codepage=utf8:cp1256
-# Enable hardware decoding if available. Often, this requires using an certain
-# video output, otherwise no hardware decoding will be used.
-#hwdec=auto
+
+# You can also include other configuration files.
+#include=/path/to/the/file/you/want/to/include
+
############
# Profiles #
@@ -111,16 +128,8 @@ audio-pitch-correction=no
# The options declared as part of profiles override global default settings,
# but only take effect when the profile is active.
-# The following profile can be enabled on the command line with: --profile=vdpau
-
-#[vdpau]
-# The profile forces the vdpau VO.
-#vo=vdpau
-# Use hardware decoding (this might break playback of some h264 files)
-#hwdec=vdpau
-# Most video filters do not work with hardware decoding.
-#vf-clr=yes
-
+# The following profile can be enabled on the command line with: --profile=invert
-# You can also include other configuration files.
-#include=/path/to/the/file/you/want/to/include
+#[invert]
+# The profile forces this video filter:
+#vf-add=flip