Factorize some code in the filters.

[vlc] / modules / video_filter / croppadd.c

diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c
index a54aa0d28324df712e8610f58af03cfe25cdf996..9f5bc64059f9ccb62c31e9d92e7dbea211fcff42 100644 (file)
--- a/modules/video_filter/croppadd.c
+++ b/modules/video_filter/croppadd.c
@@ -28,10 +28,11 @@
 # 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
@@ -45,7 +46,7 @@ static picture_t *Filter( filter_t *, picture_t * );
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Video scaling filter") );
+    set_description( N_("Video scaling filter") );
     set_capability( "video filter2", 0 );
     set_callbacks( OpenFilter, CloseFilter );
 vlc_module_end();
@@ -187,13 +188,5 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
                  ( i_outheight - i_ypadd - i_height ) * p_outplane->i_pitch );
     }
 
-    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;
-
-    p_pic->pf_release( p_pic );
-
-    return p_outpic;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }