diff options
Diffstat (limited to 'video/out')
-rw-r--r-- | video/out/opengl/hwdec.c | 3 | ||||
-rw-r--r-- | video/out/opengl/hwdec.h | 2 | ||||
-rw-r--r-- | video/out/opengl/hwdec_vda.c | 7 |
3 files changed, 2 insertions, 10 deletions
diff --git a/video/out/opengl/hwdec.c b/video/out/opengl/hwdec.c index 7665d0c056..6eefbc4744 100644 --- a/video/out/opengl/hwdec.c +++ b/video/out/opengl/hwdec.c @@ -31,7 +31,6 @@ extern const struct gl_hwdec_driver gl_hwdec_vaegl; extern const struct gl_hwdec_driver gl_hwdec_vaglx; -extern const struct gl_hwdec_driver gl_hwdec_vda; extern const struct gl_hwdec_driver gl_hwdec_videotoolbox; extern const struct gl_hwdec_driver gl_hwdec_vdpau; extern const struct gl_hwdec_driver gl_hwdec_dxva2; @@ -46,7 +45,7 @@ static const struct gl_hwdec_driver *const mpgl_hwdec_drivers[] = { #if HAVE_VDPAU_GL_X11 &gl_hwdec_vdpau, #endif -#if HAVE_VIDEOTOOLBOX_VDA_GL +#if HAVE_VIDEOTOOLBOX_GL &gl_hwdec_videotoolbox, #endif #if HAVE_DXVA2_HWACCEL diff --git a/video/out/opengl/hwdec.h b/video/out/opengl/hwdec.h index c48ec8b164..7d6f300db7 100644 --- a/video/out/opengl/hwdec.h +++ b/video/out/opengl/hwdec.h @@ -21,7 +21,7 @@ struct gl_hwdec { // IMGFMT_RGB0 indicates that the video texture is RGB. int converted_imgfmt; // Normally this is GL_TEXTURE_2D, but the hwdec driver can set it to - // GL_TEXTURE_RECTANGLE. This is needed because VDA is shit. + // GL_TEXTURE_RECTANGLE. This is needed because VideoToolbox is shit. GLenum gl_texture_target; }; diff --git a/video/out/opengl/hwdec_vda.c b/video/out/opengl/hwdec_vda.c index e921df2f80..19d93e74d6 100644 --- a/video/out/opengl/hwdec_vda.c +++ b/video/out/opengl/hwdec_vda.c @@ -17,8 +17,6 @@ * with mpv. If not, see <http://www.gnu.org/licenses/>. */ -// Note: handles both VDA and VideoToolbox - #include <assert.h> #include <IOSurface/IOSurface.h> @@ -160,12 +158,7 @@ static int create_common(struct gl_hwdec *hw, struct vda_format *format) static int create(struct gl_hwdec *hw) { - // For videotoolbox, we always request NV12. -#if HAVE_VDA_DEFAULT_INIT2 struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_NV12); -#else - struct vda_format *f = vda_get_gl_format_from_imgfmt(IMGFMT_UYVY); -#endif if (create_common(hw, f)) return -1; |