summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-11-05 17:30:26 +0100
committerwm4 <wm4@nowhere>2015-11-05 17:31:07 +0100
commit017f3d0674e48a587b9e6cd7a48f15519c799c3e (patch)
tree3a291d13df261f4f1bc4bf850e58d70d947a7e13
parent2cf9ee989c4b53f945fe4aa9f6fc17001c3a60e7 (diff)
downloadmpv-017f3d0674e48a587b9e6cd7a48f15519c799c3e.tar.bz2
mpv-017f3d0674e48a587b9e6cd7a48f15519c799c3e.tar.xz
options: enable mpeg2 hw decoding by default if hw decoding is requested
We didn't include this codec in the whitelist because of past problems with vdpau and interlacing. (I can't reproduce any problems anymore.)
-rw-r--r--DOCS/man/options.rst6
-rw-r--r--options/options.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 4eb29eb4f7..4a1951effe 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -804,9 +804,9 @@ Video
You can get the list of allowed codecs with ``mpv --vd=help``. Remove the
prefix, e.g. instead of ``lavc:h264`` use ``h264``.
- By default this is set to ``h264,vc1,wmv3,hevc``. Note that the hardware
- acceleration special codecs like ``h264_vdpau`` are not relevant anymore,
- and in fact have been removed from Libav in this form.
+ By default this is set to ``h264,vc1,wmv3,hevc,mpeg2video``. Note that the
+ hardware acceleration special codecs like ``h264_vdpau`` are not relevant
+ anymore, and in fact have been removed from Libav in this form.
This is usually only needed with broken GPUs, where a codec is reported
as supported, but decoding causes more problems than it solves.
diff --git a/options/options.c b/options/options.c
index 21ed2f4415..5cb5e2b522 100644
--- a/options/options.c
+++ b/options/options.c
@@ -800,7 +800,7 @@ const struct MPOpts mp_default_opts = {
.sub_cp = "auto",
.screenshot_template = "mpv-shot%n",
- .hwdec_codecs = "h264,vc1,wmv3,hevc",
+ .hwdec_codecs = "h264,vc1,wmv3,hevc,mpeg2video",
.index_mode = 1,