X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fnoise.c;h=030ca2ba1ea96a5fa0a3f60a0461c3a90a7d670b;hb=df1391498a5513cc50de9bc6d7895932e1454696;hp=47f0003ed529845a85dfc3a2a96490e3aaba15ec;hpb=99fab9089e9e1709d9c3a4bc5ced0c137ac59134;p=vlc

diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c
index 47f0003ed5..030ca2ba1e 100644
--- a/modules/video_filter/noise.c
+++ b/modules/video_filter/noise.c
@@ -29,10 +29,12 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
+#include "filter_picture.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -48,8 +50,8 @@ static picture_t *Filter( filter_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Noise video filter") );
-    set_shortname( _( "Noise" ));
+    set_description( N_("Noise video filter") );
+    set_shortname( N_( "Noise" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -58,10 +60,6 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
-    NULL
-};
-
 /*****************************************************************************
  * vout_sys_t: Distort video output method descriptor
  *****************************************************************************
@@ -85,13 +83,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;
-    }
-
-    config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
-                       p_filter->p_cfg );
 
     p_filter->pf_video_filter = Filter;
 
@@ -154,9 +146,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             if( rand()%8 )
             {
                 /* line isn't noisy */
-                p_filter->p_libvlc->pf_memcpy( p_out+i_line*i_pitch,
-                                               p_in+i_line*i_pitch,
-                                               i_num_cols );
+                vlc_memcpy( p_out+i_line*i_pitch, p_in+i_line*i_pitch,
+                            i_num_cols );
             }
             else
             {
@@ -178,14 +169,5 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
     }
 
-    p_outpic->date = p_pic->date;
-    p_outpic->b_force = p_pic->b_force;
-    p_outpic->i_nb_fields = p_pic->i_nb_fields;
-    p_outpic->b_progressive = p_pic->b_progressive;
-    p_outpic->b_top_field_first = p_pic->b_top_field_first;
-
-    if( p_pic->pf_release )
-        p_pic->pf_release( p_pic );
-
-    return p_outpic;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }