diff options
| author | wm4 <wm4@nowhere> | 2013-11-09 23:31:12 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-09 23:32:58 +0100 |
| commit | 87ab30669c07ec4282cafb0f7ce86015a64b5cc0 (patch) | |
| tree | 65a0748fae04674cca0d1fee392fbb1057f12f8e /video/out/gl_hwdec_vdpau.c | |
| parent | d6abfcd5784b033803d325b4dbb17836fdf7031e (diff) | |
| download | mpv-87ab30669c07ec4282cafb0f7ce86015a64b5cc0.tar.bz2 mpv-87ab30669c07ec4282cafb0f7ce86015a64b5cc0.tar.xz | |
gl_hwdec_vdpau: silence warning caused by buggy GL_NV_vdpau_interop spec
VDPAU handles are integers, but for some reasons the VDPAU GL extension
expects them as void*.
Diffstat (limited to 'video/out/gl_hwdec_vdpau.c')
| -rw-r--r-- | video/out/gl_hwdec_vdpau.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/video/out/gl_hwdec_vdpau.c b/video/out/gl_hwdec_vdpau.c index acccbacac8..02f667499c 100644 --- a/video/out/gl_hwdec_vdpau.c +++ b/video/out/gl_hwdec_vdpau.c @@ -24,6 +24,10 @@ #include "video/vdpau.h" #include "video/decode/dec_video.h" +// This is a GL_NV_vdpau_interop specification bug, and headers (unfortunately) +// follow it. I'm not sure about the original nvidia headers. +#define BRAINDEATH(x) ((void *)(uintptr_t)(x)) + static int reinit(struct gl_hwdec *hw, const struct mp_image_params *params); struct priv { @@ -151,7 +155,7 @@ static int reinit(struct gl_hwdec *hw, const struct mp_image_params *params) if (!mp_vdpau_status_ok(p->ctx)) return -1; - gl->VDPAUInitNV((void *)p->ctx->vdp_device, p->ctx->get_proc_address); + gl->VDPAUInitNV(BRAINDEATH(p->ctx->vdp_device), p->ctx->get_proc_address); #define VDP_NUM_MIXER_PARAMETER 3 static const VdpVideoMixerParameter parameters[VDP_NUM_MIXER_PARAMETER] = { @@ -196,7 +200,7 @@ static int reinit(struct gl_hwdec *hw, const struct mp_image_params *params) gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); gl->BindTexture(GL_TEXTURE_2D, 0); - p->vdpgl_surface = gl->VDPAURegisterOutputSurfaceNV((void *)p->vdp_surface, + p->vdpgl_surface = gl->VDPAURegisterOutputSurfaceNV(BRAINDEATH(p->vdp_surface), GL_TEXTURE_2D, 1, &p->gl_texture); if (!p->vdpgl_surface) |