summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-11 23:23:12 +0200
committerwm4 <wm4@nowhere>2013-08-11 23:59:18 +0200
commit8fe4790ec8945cae52ea7600312f54e1dbdf8162 (patch)
treeda448807fd64dc944387f548b5c23ec7005c59c2 /etc
parentcdf4b7d2ee666a2b4635bd9eacce7e1a414dd7c2 (diff)
downloadmpv-8fe4790ec8945cae52ea7600312f54e1dbdf8162.tar.bz2
mpv-8fe4790ec8945cae52ea7600312f54e1dbdf8162.tar.xz
video: redo hw decoding initialization, add --hwdec=auto
Change how the HW decoding stuff is organized, the way it's initialized in particular. Instead of duplicating the list of supported codecs for hwaccel decoders, add a probe function which allows each decoder to report whether it supports a given codec. Add an "auto" choice to the --hwdec option, which automatically enables hardware decoding if libavcodec and/or the VO supports it. What mpv prints on the terminal changes a bit. Now it will just print a single line whether hw decoding is used or not (and nothing at all if no hw decoding at all was requested). The pretty violent fallback from hw decoding to software decoding is still quite verbose and evil-looking though.
Diffstat (limited to 'etc')
-rw-r--r--etc/example.conf9
1 files changed, 8 insertions, 1 deletions
diff --git a/etc/example.conf b/etc/example.conf
index e610b81b4f..96c7afaca0 100644
--- a/etc/example.conf
+++ b/etc/example.conf
@@ -81,6 +81,9 @@
# Use this for a widescreen monitor, non-square pixels.
#monitoraspect=16:9
+# Enable hardware decoding if available. Often, this requires using an certain
+# video output, otherwise no hardware decoding will be used.
+#hwdec = auto
############
# Profiles #
@@ -89,7 +92,11 @@
# The options declared as part of profiles override global default settings,
# but only take effect when the profile is active.
-#[vo.vdpau]
+# 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 vdpau.