modules/access/directory.c: Fix an input_item memleak.

[vlc] / modules / video_filter / psychedelic.c

diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c
index ab6f92e53f032517a62e561817dc8b366042738b..7e7689f65af3a7b10095859f820eaa746743be11 100644 (file)
--- a/modules/video_filter/psychedelic.c
+++ b/modules/video_filter/psychedelic.c
@@ -25,13 +25,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
 #include <math.h>                                            /* sin(), cos() */
 
 #include <vlc/vlc.h>
-#include <vlc/decoder.h>
 
 #include "vlc_filter.h"
 #include "vlc_image.h"
@@ -49,7 +46,7 @@ static picture_t *Filter( filter_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Psychedelic video filter") );
-    set_shortname( N_( "Psychedelic" ));
+    set_shortname( _( "Psychedelic" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -136,7 +133,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     uint8_t u,v;
 
     picture_t *p_converted;
-    video_format_t fmt_out = {0};
+    video_format_t fmt_out;
+    memset( &fmt_out, 0, sizeof(video_format_t) );
     fmt_out.p_palette = NULL;
 
     if( !p_pic ) return NULL;
@@ -158,9 +156,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     v = p_filter->p_sys->v;
     for( y = 0; y<p_outpic->p[U_PLANE].i_lines; y++)
     {
-        memset( p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch,
+        p_filter->p_libvlc->pf_memset(
+                p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch,
                 u, p_outpic->p[U_PLANE].i_pitch );
-        memset( p_outpic->p[V_PLANE].p_pixels+y*p_outpic->p[V_PLANE].i_pitch,
+        p_filter->p_libvlc->pf_memset(
+                p_outpic->p[V_PLANE].p_pixels+y*p_outpic->p[V_PLANE].i_pitch,
                 v, p_outpic->p[V_PLANE].i_pitch );
         if( v == 0 && u != 0 )
             u --;