__EVEN: expansion-safety

[vlc] / modules / video_filter / alphamask.c

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 6127fad1fcb8775f8d71472d7ea84705a4553245..58cacbfa51717f7002ea16f14c183340d804ceb3 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.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>
 
 #include <vlc_image.h>
@@ -59,8 +60,8 @@ static int MaskCallback( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Alpha mask video filter") );
-    set_shortname( _("Alpha mask" ));
+    set_description( N_("Alpha mask video filter") );
+    set_shortname( N_("Alpha mask" ));
     set_help( ALPHAMASK_HELP );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -73,7 +74,7 @@ vlc_module_begin();
                 MASK_LONGTEXT, false );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "mask", NULL
 };
 
@@ -101,10 +102,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_sys = p_filter->p_sys;
 
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,