Properly detect XvMC capabilities.

[vlc] / modules / video_output / ggi.c

diff --git a/modules/video_output/ggi.c b/modules/video_output/ggi.c
index e9f60f7838b9d4a54f0ba567b665af1bd1e81c01..dc6c140741a45a81847f6dfe9ecb6a1c1d5821d4 100644 (file)
--- a/modules/video_output/ggi.c
+++ b/modules/video_output/ggi.c
@@ -29,6 +29,10 @@
 
 #include <ggi/ggi.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_vout.h>
@@ -59,7 +63,6 @@ static void SetPalette     ( vout_thread_t *, uint16_t *, uint16_t *, uint16_t *
 
 vlc_module_begin();
     add_string( "ggi-display", NULL, NULL, DISPLAY_TEXT, DISPLAY_LONGTEXT, VLC_TRUE );
-        change_safe();
     set_description( "General Graphics Interface video output" );
     set_capability( "video output", 30 );
     set_callbacks( Create, Destroy );
@@ -392,7 +395,7 @@ static int OpenDisplay( vout_thread_t *p_vout )
     psz_display = config_GetPsz( p_vout, "ggi_display" );
 
     p_vout->p_sys->p_display = ggiOpen( psz_display, NULL );
-    if( psz_display ) free( psz_display );
+    free( psz_display );
 
     if( p_vout->p_sys->p_display == NULL )
     {