[vlc-devel] commit: Don't handle impossible error ( Rémi Denis-Courmont )

git version control git at videolan.org
Sun Mar 1 10:47:44 CET 2009


vlc | branch: 0.9-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  1 11:44:53 2009 +0200| [22eb66dc1a2b88a0cc1d82d914fe4ce478a9dfa3] | committer: Rémi Denis-Courmont 

Don't handle impossible error

glXChooseFBConfig always return NULL if there are no adequate configs.
(cherry picked from commit ef48f9b6ff12a989e7b90573d2261a3be128e6a3)

Conflicts:

	modules/video_output/x11/glx.c

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

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

diff --git a/modules/video_output/x11/glx.c b/modules/video_output/x11/glx.c
index c9060ae..03a4963 100644
--- a/modules/video_output/x11/glx.c
+++ b/modules/video_output/x11/glx.c
@@ -243,10 +243,9 @@ int InitGLX13( vout_thread_t *p_vout )
 
     /* 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 == NULL )
     {
         msg_Err( p_vout, "Cannot get FB configurations");
-        if( p_fbconfs ) XFree( p_fbconfs );
         return VLC_EGENERIC;
     }
     fbconf = p_fbconfs[0];




More information about the vlc-devel mailing list