[vlc-commits] commit: --glx-display is also merged with --x11-display ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Jun  2 21:24:47 2010 +0300| [ab733ffc4a7a1d399c63d96535b39aad1f186639] | committer: Rémi Denis-Courmont 

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

(cherry picked from commit b4b9d3840f13781db372a7dcf4613d4a35d26784)

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

 src/libvlc-module.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index 43e9bef..363c102 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 */