YUV 422 Packed motion detect (still kind of broken).

[vlc] / modules / video_filter / alphamask.c

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index c1fa05c847096c75bc35ea552d247f667970b4f1..e3edea223fc4359f1a4ccd1c6c9f9a4a38b42572 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -2,7 +2,7 @@
  * alphamask.c : Alpha layer mask video filter for vlc
  *****************************************************************************
  * Copyright (C) 2007 the VideoLAN team
- * $Id: invert.c 18062 2006-11-26 14:20:34Z zorglub $
+ * $Id$
  *
  * Authors: Antoine Cellerier <dionoea at videolan tod org>
  *
@@ -25,7 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include <vlc_image.h>
@@ -55,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 );
@@ -66,10 +71,10 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 
     add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
-                MASK_LONGTEXT, VLC_FALSE );
+                MASK_LONGTEXT, false );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "mask", NULL
 };
 
@@ -106,7 +111,7 @@ static int Create( vlc_object_t *p_this )
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
-    vlc_mutex_init( p_filter, &p_sys->mask_lock );
+    vlc_mutex_init( &p_sys->mask_lock );
     psz_string =
         var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
     var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
@@ -176,16 +181,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             for( i_line = 0; i_line < i_lines; i_line++,
                  p_src += i_src_pitch, p_dst += i_dst_pitch )
             {
-                p_filter->p_libvlc->pf_memcpy(
-                    p_dst, p_src, i_visible_pitch );
+                vlc_memcpy( p_dst, p_src, i_visible_pitch );
             }
         }
         else
         {
             /* plane sizes match */
-            p_filter->p_libvlc->pf_memcpy(
-                p_apic->p_pixels, p_mask->p_pixels,
-                p_mask->i_pitch * p_mask->i_lines );
+            vlc_memcpy( p_apic->p_pixels, p_mask->p_pixels,
+                        p_mask->i_pitch * p_mask->i_lines );
         }
     }
     vlc_mutex_unlock( &p_sys->mask_lock );
@@ -215,6 +218,7 @@ static int MaskCallback( vlc_object_t *p_this, char const *psz_var,
                          vlc_value_t oldval, vlc_value_t newval,
                          void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     filter_t *p_filter = (filter_t *)p_data;
     filter_sys_t *p_sys = p_filter->p_sys;
     int i_ret = VLC_SUCCESS;