From b7ce3ac44575d82b5b23f10477b1158b84394b8f Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 30 Oct 2017 18:31:20 +0100 Subject: vd_lavc: remove need for duplicated cuda GL interop backend This is just a dumb consequence of HWDEC_ types somehow being part of both decoder and VO. Obviously, the VO should only care about supporting specific hardware surface types or providing specific device types, but until they are separated, stupid unintuitive mismatches will occur. --- video/out/gpu/hwdec.c | 1 - video/out/opengl/hwdec_cuda.c | 18 +----------------- 2 files changed, 1 insertion(+), 18 deletions(-) (limited to 'video/out') diff --git a/video/out/gpu/hwdec.c b/video/out/gpu/hwdec.c index d88dc5e779..48ed4db58e 100644 --- a/video/out/gpu/hwdec.c +++ b/video/out/gpu/hwdec.c @@ -66,7 +66,6 @@ static const struct ra_hwdec_driver *const mpgl_hwdec_drivers[] = { #endif #if HAVE_CUDA_HWACCEL &ra_hwdec_cuda, - &ra_hwdec_cuda_nvdec, #endif #if HAVE_RPI &ra_hwdec_rpi_overlay, diff --git a/video/out/opengl/hwdec_cuda.c b/video/out/opengl/hwdec_cuda.c index 5aefed106d..321826eb49 100644 --- a/video/out/opengl/hwdec_cuda.c +++ b/video/out/opengl/hwdec_cuda.c @@ -326,24 +326,8 @@ static int mapper_map(struct ra_hwdec_mapper *mapper) } const struct ra_hwdec_driver ra_hwdec_cuda = { - .name = "cuda", - .api = HWDEC_CUDA, - .imgfmts = {IMGFMT_CUDA, 0}, - .priv_size = sizeof(struct priv_owner), - .init = cuda_init, - .uninit = cuda_uninit, - .mapper = &(const struct ra_hwdec_mapper_driver){ - .priv_size = sizeof(struct priv), - .init = mapper_init, - .uninit = mapper_uninit, - .map = mapper_map, - .unmap = mapper_unmap, - }, -}; - -const struct ra_hwdec_driver ra_hwdec_cuda_nvdec = { .name = "cuda-nvdec", - .api = HWDEC_NVDEC, + .api = HWDEC_CUDA, .imgfmts = {IMGFMT_CUDA, 0}, .priv_size = sizeof(struct priv_owner), .init = cuda_init, -- cgit v1.2.3