]> git.sesse.net Git - vlc/blobdiff - modules/video_filter/alphamask.c
Distribute missing header
[vlc] / modules / video_filter / alphamask.c
index c65cb6bcd6185ea0a10aed26d11c6fa339617f51..c2b11c43aa1e3f4ca5d7642bc52e7df0a15662d6 100644 (file)
@@ -87,12 +87,12 @@ static int Create( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
-    char *psz_string = NULL;
+    char *psz_string;
 
     if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
-                 "Unsupported input chroma \"%4s\". "
+                 "Unsupported input chroma \"%4.4s\". "
                  "Alphamask can only use \"YUVA\".",
                  (char*)&p_filter->fmt_in.video.i_chroma );
         return VLC_EGENERIC;
@@ -107,8 +107,8 @@ static int Create( vlc_object_t *p_this )
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
-    p_sys->p_mask = NULL;
-#if 0 /* This appears to be dead code. Where is psz_string initialized? */
+    psz_string =
+        var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
     if( psz_string && *psz_string )
     {
         LoadMask( p_filter, psz_string );
@@ -116,12 +116,11 @@ static int Create( vlc_object_t *p_this )
             msg_Err( p_filter, "Error while loading mask (%s).",
                      psz_string );
     }
+    else
+       p_sys->p_mask = NULL;
     free( psz_string );
-#endif
 
     vlc_mutex_init( &p_sys->mask_lock );
-    psz_string =
-        var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
     var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
                      p_filter );
     p_filter->pf_video_filter = Filter;