From: Rémi Denis-Courmont <remi@remlab.net>
Date: Wed, 2 Jun 2010 18:24:47 +0000 (+0300)
Subject: --glx-display is also merged with --x11-display
X-Git-Tag: 1.2.0-pre1~6341
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b4b9d3840f13781db372a7dcf4613d4a35d26784;p=vlc

--glx-display is also merged with --x11-display
---

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 43e9bef772..363c10254d 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -1640,6 +1640,7 @@ vlc_module_begin ()
     add_string( "x11-display", NULL, NULL,
                 DISPLAY_TEXT, DISPLAY_LONGTEXT, true )
         add_deprecated_alias( "xvideo-display" ) /* deprecated since 1.1.0 */
+        add_deprecated_alias( "glx-display" )
     add_bool( "drop-late-frames", 1, NULL, DROP_LATE_FRAMES_TEXT,
               DROP_LATE_FRAMES_LONGTEXT, true )
     /* Used in vout_synchro */