Mostly revert [25311], [25313].

[vlc] / modules / video_filter / crop.c

diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c
index 200aba17a8cb144c168e6dce9fa6c7827cb59012..79c227e39b350d2dced6d7d786700881d00142e9 100644 (file)
--- a/modules/video_filter/crop.c
+++ b/modules/video_filter/crop.c
@@ -27,6 +27,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
 #include <vlc_interface.h>
@@ -104,37 +108,28 @@ vlc_module_begin();
 
     add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT,
                                              GEOMETRY_LONGTEXT, VLC_FALSE );
-        change_safe();
     add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT,
                                    AUTOCROP_LONGTEXT, VLC_FALSE );
-        change_safe();
 
 #ifdef BEST_AUTOCROP
     add_integer_with_range( "autocrop-ratio-max", 2405, 0, RATIO_MAX, NULL,
                             RATIOMAX_TEXT, RATIOMAX_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     add_integer_with_range( "crop-ratio", 0, 0, RATIO_MAX, NULL, RATIO_TEXT,
                             RATIO_LONGTEXT, VLC_FALSE );
-        change_safe();
     add_integer( "autocrop-time", 25, NULL, TIME_TEXT,
                  TIME_LONGTEXT, VLC_TRUE );
-        change_safe();
     add_integer( "autocrop-diff", 16, NULL, DIFF_TEXT,
                                             DIFF_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     add_integer( "autocrop-non-black-pixels", 3, NULL,
                  NBP_TEXT, NBP_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     add_integer_with_range( "autocrop-skip-percent", 17, 0, 100, NULL,
                             SKIP_TEXT, SKIP_LONGTEXT, VLC_TRUE );
-        change_safe();
 
     add_integer_with_range( "autocrop-luminance-threshold", 40, 0, 128, NULL,
                             LUM_TEXT, LUM_LONGTEXT, VLC_TRUE );
-        change_safe();
 #endif //BEST_AUTOCROP
 
     add_shortcut( "crop" );
@@ -839,6 +834,7 @@ static void UpdateStats( vout_thread_t *p_vout, picture_t *p_pic )
 static int SendEvents( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *_p_vout )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     vout_thread_t *p_vout = (vout_thread_t *)_p_vout;
     vlc_value_t sentval = newval;
 
@@ -863,6 +859,7 @@ static int SendEvents( vlc_object_t *p_this, char const *psz_var,
 static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
                        vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(p_data); VLC_UNUSED(oldval);
     vout_thread_t *p_vout = (vout_thread_t *)p_this;
     var_Set( p_vout->p_sys->p_vout, psz_var, newval );
     return VLC_SUCCESS;
@@ -876,6 +873,7 @@ static int FilterCallback( vlc_object_t *p_this, char const *psz_var,
                            vlc_value_t oldval, vlc_value_t newval,
                            void *p_data )
 {
+    VLC_UNUSED(p_data); VLC_UNUSED(oldval);
     vout_thread_t * p_vout = (vout_thread_t *)p_this;
 
     if( !strcmp( psz_var, "ratio-crop" ) )