diff options
| author | wm4 <wm4@nowhere> | 2017-09-26 18:00:46 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2017-09-26 18:00:46 +0200 |
| commit | 5d57e9b1be2d0a60247a3d170b93a81d2c775012 (patch) | |
| tree | d49fee7f1c069e4cdae01e446b10f8965b59ea2a /video/decode/vd_lavc.c | |
| parent | 83678f76b7754a3ca1dfbf991eb8d9907c584087 (diff) | |
| download | mpv-5d57e9b1be2d0a60247a3d170b93a81d2c775012.tar.bz2 mpv-5d57e9b1be2d0a60247a3d170b93a81d2c775012.tar.xz | |
video: drop old cuda/cuvid hwaccel
Just use FFmpeg 3.3 (or whatever it was) to get Cuvid support.
Diffstat (limited to 'video/decode/vd_lavc.c')
| -rw-r--r-- | video/decode/vd_lavc.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c index d861ff2182..1275a67300 100644 --- a/video/decode/vd_lavc.c +++ b/video/decode/vd_lavc.c @@ -143,7 +143,6 @@ extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2; extern const struct vd_lavc_hwdec mp_vd_lavc_dxva2_copy; extern const struct vd_lavc_hwdec mp_vd_lavc_d3d11va; extern const struct vd_lavc_hwdec mp_vd_lavc_d3d11va_copy; -extern const struct vd_lavc_hwdec mp_vd_lavc_cuda_old; #if HAVE_RPI static const struct vd_lavc_hwdec mp_vd_lavc_rpi = { @@ -166,15 +165,13 @@ static const struct vd_lavc_hwdec mp_vd_lavc_mediacodec = { }; #endif -#if NEW_CUDA_HWACCEL +#if HAVE_CUDA_HWACCEL static const struct vd_lavc_hwdec mp_vd_lavc_cuda = { .type = HWDEC_CUDA, .image_format = IMGFMT_CUDA, .lavc_suffix = "_cuvid", .generic_hwaccel = true, }; -#endif -#if HAVE_CUDA_HWACCEL static const struct vd_lavc_hwdec mp_vd_lavc_cuda_copy = { .type = HWDEC_CUDA_COPY, .lavc_suffix = "_cuvid", @@ -282,11 +279,7 @@ static const struct vd_lavc_hwdec *const hwdec_list[] = { &mp_vd_lavc_mediacodec, #endif #if HAVE_CUDA_HWACCEL - #if NEW_CUDA_HWACCEL &mp_vd_lavc_cuda, - #else - &mp_vd_lavc_cuda_old, - #endif &mp_vd_lavc_cuda_copy, #endif &mp_vd_lavc_crystalhd, |