summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2017-12-10 23:51:22 +0200
committerJan Ekström <jeebjp@gmail.com>2017-12-11 20:44:59 +0200
commita4705e8b59a0c496852d67db591bb480e0146e5e (patch)
tree8ea79dda29536985522b76ceb4beb7d9e1bd6c23 /video
parentfd4e756e9c1c9088875d9c856946664b2e42f137 (diff)
downloadmpv-a4705e8b59a0c496852d67db591bb480e0146e5e.tar.bz2
mpv-a4705e8b59a0c496852d67db591bb480e0146e5e.tar.xz
vd_lavc: always load VO interops with non-copy hw decoders
For METHOD_INTERNAL hwdecs (non-copy cases), make sure the VO interops are always loaded, because those decoders will output hardware pixel formats, which will need special support in vo_gpu. Otherwise, initialization will fail, complaining that it can't convert the output format to something the VO supports.
Diffstat (limited to 'video')
-rw-r--r--video/decode/vd_lavc.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 58dba5a81e..87964d6fdc 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -471,6 +471,10 @@ static void select_and_set_hwdec(struct dec_video *vd)
}
MP_WARN(vd, "Using emulated hardware decoding API.\n");
}
+ } else if (!hwdec->copying) {
+ // Most likely METHOD_INTERNAL, which often use delay-loaded
+ // VO support as well.
+ hwdec_devices_request_all(vd->hwdec_devs);
}
ctx->use_hwdec = true;