summaryrefslogtreecommitdiffstats
path: root/video/out/gpu
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2019-12-28 12:58:39 -0800
committerPhilip Langdale <github.philipl@overt.org>2019-12-29 14:32:47 -0800
commit9c05be8999a77deea056c8c4952ab37756d05ce2 (patch)
tree9e5e7eb1e606adb7882175f5e7e8c164e13c3386 /video/out/gpu
parentf0d0822595c7dc3e2a20aa3e153a94f08f1d88dd (diff)
downloadmpv-9c05be8999a77deea056c8c4952ab37756d05ce2.tar.bz2
mpv-9c05be8999a77deea056c8c4952ab37756d05ce2.tar.xz
video: cuda: add explicit context creation for copy hwaccels
In the distant past, the cuviddec backed copy hwaccel could be configured directly using lavc options. However, since that time, we gained support for automatic hw ctx creation which ended up bypassing the lavc options. Rather than trying to find a way to pass those options again, a better idea is to make the 'cuda-decode-device' option, used by the interop hwaccels, work for the copy hwaccels too. And that's pretty simple: we have to add a create function that checks the option and passes it on to ffmpeg. Note that this does require a slight re-jig to the configuration flags, as we now have a scenario where we want to build with support for the cuda copy hwaccels but not the interop ones. So we need a distinct configuration flag for that combination. Fixes #7295.
Diffstat (limited to 'video/out/gpu')
-rw-r--r--video/out/gpu/hwdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gpu/hwdec.c b/video/out/gpu/hwdec.c
index f1c941cdc9..c07dbf9fd0 100644
--- a/video/out/gpu/hwdec.c
+++ b/video/out/gpu/hwdec.c
@@ -64,7 +64,7 @@ const struct ra_hwdec_driver *const ra_hwdec_drivers[] = {
#if HAVE_GL_DXINTEROP_D3D9
&ra_hwdec_dxva2gldx,
#endif
-#if HAVE_CUDA_HWACCEL
+#if HAVE_CUDA_INTEROP
&ra_hwdec_cuda,
#endif
#if HAVE_VDPAU_GL_X11