[vlc-commits] vdpau: keep the device used to create the vdp in the decoder device

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Nov 22 11:55:36 2019 +0100| [e3d59452780c040a57e2c789e27759bd548a9ac0] | committer: Steve Lhomme

vdpau: keep the device used to create the vdp in the decoder device

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3d59452780c040a57e2c789e27759bd548a9ac0
---

 modules/hw/vdpau/vlc_vdpau.h                  | 1 +
 modules/video_output/opengl/converter_vdpau.c | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hw/vdpau/vlc_vdpau.h b/modules/hw/vdpau/vlc_vdpau.h
index 81f5ad1c50..abdee8d77d 100644
--- a/modules/hw/vdpau/vlc_vdpau.h
+++ b/modules/hw/vdpau/vlc_vdpau.h
@@ -277,6 +277,7 @@ typedef struct vlc_vdp_video_field
 
 typedef struct {
     vdp_t              *vdp;
+    VdpDevice          device;
 } vdpau_decoder_device_t;
 
 static inline vdpau_decoder_device_t *GetVDPAUOpaqueDevice(vlc_decoder_device *device)
diff --git a/modules/video_output/opengl/converter_vdpau.c b/modules/video_output/opengl/converter_vdpau.c
index f71585bdf5..a2a2d0eb2e 100644
--- a/modules/video_output/opengl/converter_vdpau.c
+++ b/modules/video_output/opengl/converter_vdpau.c
@@ -224,9 +224,8 @@ DecoderDeviceOpen(vlc_decoder_device *device, vout_window_t *window)
     if (unlikely(sys == NULL))
         return VLC_ENOMEM;
 
-    VdpDevice vdpdevice;
-
-    if (vdp_get_x11(window->display.x11, -1, &sys->vdp, &vdpdevice) != VDP_STATUS_OK)
+    if (vdp_get_x11(window->display.x11, -1,
+                    &sys->vdp, &sys->device) != VDP_STATUS_OK)
     {
         vlc_obj_free(VLC_OBJECT(device), sys);
         return VLC_EGENERIC;