[vlc-commits] [Git][videolan/vlc][master] interop_vdpau: avoid loading decoder device without X11

Rémi Denis-Courmont (@Courmisch) gitlab at videolan.org
Wed Nov 17 16:33:36 UTC 2021



Rémi Denis-Courmont pushed to branch master at VideoLAN / VLC


Commits:
67a78178 by Alexandre Janniaux at 2021-11-17T16:19:50+00:00
interop_vdpau: avoid loading decoder device without X11

The decoder device was loaded when running in KMS window, leading to
crashes.

- - - - -


1 changed file:

- modules/video_output/opengl/interop_vdpau.c


Changes:

=====================================
modules/video_output/opengl/interop_vdpau.c
=====================================
@@ -211,7 +211,10 @@ static const struct vlc_decoder_device_operations dev_ops = {
 static int
 DecoderDeviceOpen(vlc_decoder_device *device, vout_window_t *window)
 {
-    if (!window || !vlc_xlib_init(VLC_OBJECT(window)))
+    if (!window || window->type != VOUT_WINDOW_TYPE_XID)
+        return VLC_EGENERIC;
+
+    if (!vlc_xlib_init(VLC_OBJECT(window)))
         return VLC_EGENERIC;
 
     vdpau_decoder_device_t *sys = vlc_obj_malloc(VLC_OBJECT(device), sizeof(*sys));



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/67a781788ad37dfa0f76be3e117d9a8144c00188

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/67a781788ad37dfa0f76be3e117d9a8144c00188
You're receiving this email because of your account on code.videolan.org.




More information about the vlc-commits mailing list