* Cleanup that file a bit

[vlc] / modules / video_filter / adjust.c

diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c
index 8225632c041a0d709c93f1912a915110d73c13c3..47121a6f9325a76396b68b6e28a3af934e42f264 100644 (file)
--- a/modules/video_filter/adjust.c
+++ b/modules/video_filter/adjust.c
@@ -31,8 +31,8 @@
 #include <math.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include <vlc/decoder.h>
+#include <vlc_sout.h>
+#include <vlc_vout.h>
 
 #include "vlc_filter.h"
 
@@ -71,9 +71,9 @@ static picture_t *Filter( filter_t *, picture_t * );
 
 vlc_module_begin();
     set_description( _("Image properties filter") );
-    set_shortname( N_("Image adjust" ));
+    set_shortname( _("Image adjust" ));
     set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER2 );
+    set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
 
     add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL,
@@ -167,7 +167,7 @@ static int Create( vlc_object_t *p_this )
 
     /* needed to get options passed in transcode using the
      * adjust{name=value} syntax */
-    sout_CfgParse( p_filter, "", ppsz_filter_options,
+    config_ChainParse( p_filter, "", ppsz_filter_options,
                    p_filter->p_cfg );
 
     var_Create( p_filter, "contrast",
@@ -426,7 +426,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;
 }