[vlc-devel] commit: GLX: minor fixes ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sat Jan 10 22:21:26 2009 +0200| [f0d6d8402f2d781412fe8336dba8a305f1ca0f74] | committer: Rémi Denis-Courmont 

GLX: minor fixes

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

 modules/video_output/x11/glx.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index bdc68b0..6ad4158 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -238,11 +238,11 @@ int InitGLX13( vout_thread_t *p_vout )
     XVisualInfo *p_vi;
     int p_attr[] = { GLX_RED_SIZE, 5, GLX_GREEN_SIZE, 5,
                      GLX_BLUE_SIZE, 5, GLX_DOUBLEBUFFER, True,
-                     GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, 0 };
+                     GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, None, };
 
     /* Get the FB configuration */
     p_fbconfs = glXChooseFBConfig( p_sys->p_display, 0, p_attr, &i_nbelem );
-    if( (i_nbelem <= 0) || !p_fbconfs )
+    if( !p_fbconfs || (i_nbelem <= 0) )
     {
         msg_Err( p_vout, "Cannot get FB configurations");
         if( p_fbconfs ) XFree( p_fbconfs );
@@ -266,6 +266,7 @@ int InitGLX13( vout_thread_t *p_vout )
     if( p_sys->gwnd == None )
     {
         msg_Err( p_vout, "Cannot create GLX window" );
+        XFree( p_fbconfs );
         return VLC_EGENERIC;
     }