[vlc-devel] commit: Don't try to read non-existent glx-shm config item ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Tue Dec  1 21:21:07 2009 +0200| [afbe18cb9ca22d517e9c730750c7cd8431fbd225] | committer: Rémi Denis-Courmont 

Don't try to read non-existent glx-shm config item

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

 modules/video_output/x11/xcommon.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/x11/xcommon.c b/modules/video_output/x11/xcommon.c
index 7b83541..adc5e79 100644
--- a/modules/video_output/x11/xcommon.c
+++ b/modules/video_output/x11/xcommon.c
@@ -2772,6 +2772,7 @@ static int InitDisplay( vout_thread_t *p_vout )
 #ifdef HAVE_SYS_SHM_H
     p_vout->p_sys->i_shm_opcode = 0;
 
+#ifndef MODULE_NAME_IS_glx
     if( config_GetInt( p_vout, MODULE_STRING "-shm" ) > 0 )
     {
         int major, evt, err;
@@ -2799,6 +2800,7 @@ static int InitDisplay( vout_thread_t *p_vout )
     else
         msg_Dbg( p_vout, "XShm video extension disabled" );
 #endif
+#endif
 
 #ifdef MODULE_NAME_IS_xvideo
     /* XXX The brightness and contrast values should be read from environment