Disable crashy FS controller by default

[vlc] / modules / video_output / vmem.c

diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index cc8cfbcbbfbe80e48d8c2034f3fb5ef102e5a298..5de7f09af0a5966bd513bf8bba27db8899fb77b5 100644 (file)
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 /*****************************************************************************
@@ -71,8 +72,8 @@ static int  UnlockPicture ( vout_thread_t *, picture_t * );
 #define LT_DATA N_( "Data for the locking and unlocking functions" )
 
 vlc_module_begin( );
-    set_description( _( "Video memory module" ) );
-    set_shortname( _("Video memory") );
+    set_description( N_( "Video memory module" ) );
+    set_shortname( N_("Video memory") );
 
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VOUT );
@@ -144,6 +145,7 @@ static int Init( vout_thread_t *p_vout )
         if( strlen( psz_chroma ) < 4 )
         {
             msg_Err( p_vout, "vmem-chroma should be 4 characters long" );
+            free( psz_chroma );
             return VLC_EGENERIC;
         }
         i_chroma = VLC_FOURCC( psz_chroma[0], psz_chroma[1],