vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Dec 24 16:24:57 2018 +0200| [c0f65817bb42899535ef35868cf172624f6e72a5] | committer: Rémi Denis-Courmont
opengl: remove redundant VdpDevice > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c0f65817bb42899535ef35868cf172624f6e72a5 --- modules/video_output/opengl/converter_vdpau.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/converter_vdpau.c index 00275771b3..769f351dfa 100644 --- a/modules/video_output/opengl/converter_vdpau.c +++ b/modules/video_output/opengl/converter_vdpau.c @@ -50,7 +50,6 @@ struct priv { vdp_t *vdp; - VdpDevice vdp_device; }; static PFNGLVDPAUINITNVPROC _glVDPAUInitNV; @@ -164,15 +163,17 @@ Open(vlc_object_t *obj) return VLC_EGENERIC; tc->priv = priv; + VdpDevice device; + if (vdp_get_x11(tc->gl->surface->display.x11, -1, - &priv->vdp, &priv->vdp_device) != VDP_STATUS_OK) + &priv->vdp, &device) != VDP_STATUS_OK) { free(priv); return VLC_EGENERIC; } void *vdp_gpa; - if (vdp_get_proc_address(priv->vdp, priv->vdp_device, + if (vdp_get_proc_address(priv->vdp, device, VDP_FUNC_ID_GET_PROC_ADDRESS, &vdp_gpa) != VDP_STATUS_OK) { @@ -200,7 +201,7 @@ Open(vlc_object_t *obj) SAFE_GPA(glVDPAUUnmapSurfacesNV); #undef SAFE_GPA - INTEROP_CALL(glVDPAUInitNV, (void *)(size_t)priv->vdp_device, vdp_gpa); + INTEROP_CALL(glVDPAUInitNV, (void *)(uintptr_t)device, vdp_gpa); tc->fshader = opengl_fragment_shader_init(tc, GL_TEXTURE_2D, VLC_CODEC_RGB32, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
