diff options
| author | Philip Langdale <philipl@overt.org> | 2016-09-15 20:15:36 -0700 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-09-16 14:26:30 +0200 |
| commit | b83bfea05df01c7bcd15d594c4b8aebf60f8618a (patch) | |
| tree | 47b08fa23a46126b098f9f83f61bc669db99a806 /video | |
| parent | cf5c3fc31a8fa16acfe7674bd984b58520cbc315 (diff) | |
| download | mpv-b83bfea05df01c7bcd15d594c4b8aebf60f8618a.tar.bz2 mpv-b83bfea05df01c7bcd15d594c4b8aebf60f8618a.tar.xz | |
hwdec_cuda: Rename config variable to be more consistent
'cuda-gl' isn't right - you can turn this on without any GL and
get some non-zero benefit (with the cuda-copy hwaccel). So
'cuda-hwaccel' seems more consistent with everything else.
Diffstat (limited to 'video')
| -rw-r--r-- | video/decode/vd_lavc.c | 4 | ||||
| -rw-r--r-- | video/fmt-conversion.c | 2 | ||||
| -rw-r--r-- | video/out/opengl/hwdec.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index e21f60972d..d8a8b320b0 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -151,7 +151,7 @@ static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = { }; #endif -#if HAVE_CUDA_GL +#if HAVE_CUDA_HWACCEL static const struct vd_lavc_hwdec mp_vd_lavc_cuda_copy = { .type = HWDEC_CUDA_COPY, .lavc_suffix = "_cuvid", @@ -183,7 +183,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { #if HAVE_ANDROID &mp_vd_lavc_mediacodec, #endif -#if HAVE_CUDA_GL +#if HAVE_CUDA_HWACCEL &mp_vd_lavc_cuda, &mp_vd_lavc_cuda_copy, #endif diff --git a/video/fmt-conversion.c b/video/fmt-conversion.c index 2d0425f26a..aa78e99f9b 100644 --- a/video/fmt-conversion.c +++ b/video/fmt-conversion.c @@ -115,7 +115,7 @@ static const struct { #if HAVE_AV_PIX_FMT_MMAL {IMGFMT_MMAL, AV_PIX_FMT_MMAL}, #endif -#if HAVE_CUDA_GL +#if HAVE_CUDA_HWACCEL {IMGFMT_CUDA, AV_PIX_FMT_CUDA}, #endif #ifdef AV_PIX_FMT_P010 diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index f5943aa61b..7d47e152b5 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -60,7 +60,7 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { #endif &gl_hwdec_dxva2, #endif -#if HAVE_CUDA_GL +#if HAVE_CUDA_HWACCEL &gl_hwdec_cuda, #endif #if HAVE_RPI |