[vlc-commits] Revert "Force the X11 video outputs when libvlc_*_set_xwindow() is used"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Oct 10 20:14:12 2017 +0300| [a4b42264e674242b3eea384fd68a204f2c163e0a] | committer: Rémi Denis-Courmont

Revert "Force the X11 video outputs when libvlc_*_set_xwindow() is used"

This reverts commit 4787f2365afd93cbd2fa8fc5790920b5ad10fc40.

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

 modules/hw/vdpau/display.c        | 2 +-
 modules/video_output/xcb/x11.c    | 2 +-
 modules/video_output/xcb/xvideo.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index cb5bc766eb..edd6096729 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -49,7 +49,7 @@ vlc_module_begin()
     set_capability("vout display", 0)
     set_callbacks(Open, Close)
 
-    add_shortcut("vdpau", "xid")
+    add_shortcut("vdpau")
 vlc_module_end()
 
 struct vout_display_sys_t
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 4c633174a6..ef671c84f5 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -51,7 +51,7 @@ vlc_module_begin ()
     set_subcategory (SUBCAT_VIDEO_VOUT)
     set_capability ("vout display", 100)
     set_callbacks (Open, Close)
-    add_shortcut ("xcb-x11", "x11", "xid")
+    add_shortcut ("xcb-x11", "x11")
 
     add_obsolete_bool ("x11-shm") /* obsoleted since 2.0.0 */
 vlc_module_end ()
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 73f41479a3..e79b013b69 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -72,7 +72,7 @@ vlc_module_begin ()
     add_integer ("xvideo-format-id", 0,
                  FORMAT_TEXT, FORMAT_LONGTEXT, true)
     add_obsolete_bool ("xvideo-shm") /* removed in 2.0.0 */
-    add_shortcut ("xcb-xv", "xv", "xvideo", "xid")
+    add_shortcut ("xcb-xv", "xv", "xvideo")
 vlc_module_end ()
 
 #define MAX_PICTURES (128)