X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fbluescreen.c;h=2499f55d9b016180d56d29c1a85010dd8182f00e;hb=bc19641ab140e8b4c6d28428b4f12f57d93b7cee;hp=41fc5b7d491e5f2d6c57c068307a6258f3f62289;hpb=4f028428053d0342c55deb6ba8b8da114c6a0caa;p=vlc

diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index 41fc5b7d49..2499f55d9b 100644
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -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_filter.h"
@@ -71,8 +76,8 @@ static int BluescreenCallback( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Bluescreen video filter") );
-    set_shortname( _("Bluescreen" ));
+    set_description( N_("Bluescreen video filter") );
+    set_shortname( N_("Bluescreen" ));
     set_help( BLUESCREEN_HELP );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -81,18 +86,18 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 
     add_integer_with_range( CFG_PREFIX "u", 120, 0, 255, NULL,
-                            BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, VLC_FALSE );
+                            BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false );
     add_integer_with_range( CFG_PREFIX "v", 90, 0, 255, NULL,
-                            BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, VLC_FALSE );
+                            BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, false );
     add_integer_with_range( CFG_PREFIX "ut", 17, 0, 255, NULL,
                             BLUESCREENUTOL_TEXT, BLUESCREENUTOL_LONGTEXT,
-                            VLC_FALSE );
+                            false );
     add_integer_with_range( CFG_PREFIX "vt", 17, 0, 255, NULL,
                             BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT,
-                            VLC_FALSE );
+                            false );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "u", "v", "ut", "vt", NULL
 };
 
@@ -119,10 +124,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,
@@ -195,7 +197,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
     }
     /* Gaussian convolution to make it look cleaner */
-    p_filter->p_libvlc->pf_memset( p_a, 0, 2 * i_pitch );
+    vlc_memset( p_a, 0, 2 * i_pitch );
     for( i = 2; i < i_lines - 2; i++ )
     {
         p_a[i*i_pitch] = 0x00;
@@ -247,6 +249,7 @@ static int BluescreenCallback( 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_sys_t *p_sys = (filter_sys_t *) p_data;
 
 #define VAR_IS( a ) !strcmp( psz_var, CFG_PREFIX a )