Qt4 - pixmaps again. Removing bigger images, useless ones, and cleaning.

[vlc] / modules / video_filter / ripple.c

diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index e5c1ddc71d60dcec1f14d6e2118c7e84d07a6a62..59b623ca54df4ca294de58ce07ac913f22a519af 100644 (file)
--- a/modules/video_filter/ripple.c
+++ b/modules/video_filter/ripple.c
@@ -25,15 +25,12 @@
 /*****************************************************************************
  * 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_vout.h>
+#include <vlc_filter.h>
 
 /*****************************************************************************
  * Local prototypes
@@ -177,13 +174,15 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
                              p_pic->p[i_index].i_visible_pitch + i_offset );
                     p_in -= p_pic->p[i_index].i_pitch;
                     p_out += p_outpic->p[i_index].i_pitch;
-                    memset( p_out + i_offset, black_pixel, -i_offset );
+                    p_filter->p_libvlc->pf_memset( p_out + i_offset,
+                                                   black_pixel, -i_offset );
                 }
                 else
                 {
                     p_filter->p_libvlc->pf_memcpy( p_out + i_offset, p_in,
                              p_pic->p[i_index].i_visible_pitch - i_offset );
-                    memset( p_out, black_pixel, i_offset );
+                    p_filter->p_libvlc->pf_memset( p_out, black_pixel,
+                                                   i_offset );
                     p_in -= p_pic->p[i_index].i_pitch;
                     p_out += p_outpic->p[i_index].i_pitch;
                 }