Remove _GNU_SOURCE and string.h too

[vlc] / modules / video_filter / ripple.c

diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c
index 5c1c742596cc584937c9f33ccb912980cfbfbb15..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
@@ -48,10 +45,10 @@ static picture_t *Filter( filter_t *, picture_t * );
  *****************************************************************************/
 vlc_module_begin();
     set_description( _("Ripple video filter") );
-    set_shortname( N_( "Ripple" ));
+    set_shortname( _( "Ripple" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_shortcut( "ripple" );
     set_callbacks( Create, Destroy );
@@ -151,7 +148,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
         for( i_line = 0 ; i_line < i_first_line ; i_line++ )
         {
-            p_filter->p_vlc->pf_memcpy( p_out, p_in,
+            p_filter->p_libvlc->pf_memcpy( p_out, p_in,
                                       p_pic->p[i_index].i_visible_pitch );
             p_in += p_pic->p[i_index].i_pitch;
             p_out += p_outpic->p[i_index].i_pitch;
@@ -173,24 +170,26 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             {
                 if( i_offset < 0 )
                 {
-                    p_filter->p_vlc->pf_memcpy( p_out, p_in - i_offset,
+                    p_filter->p_libvlc->pf_memcpy( p_out, p_in - i_offset,
                              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_vlc->pf_memcpy( p_out + i_offset, p_in,
+                    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;
                 }
             }
             else
             {
-                p_filter->p_vlc->pf_memcpy( p_out, p_in,
+                p_filter->p_libvlc->pf_memcpy( p_out, p_in,
                                           p_pic->p[i_index].i_visible_pitch );
                 p_in -= p_pic->p[i_index].i_pitch;
                 p_out += p_outpic->p[i_index].i_pitch;
@@ -205,7 +204,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     p_outpic->b_progressive = p_pic->b_progressive;
     p_outpic->b_top_field_first = p_pic->b_top_field_first;
 
-    p_pic->pf_release( p_pic );
+    if( p_pic->pf_release )
+        p_pic->pf_release( p_pic );
 
     return p_outpic;
 }