Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / video_filter / opencv_wrapper.c

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index cc87e629b152974b65932f25233dca7bf6a8305b..c44f9517e1976406781ccbe06921702f9a28f5bc 100644 (file)
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -28,6 +28,10 @@
 #include <cv.h>
 #include <highgui.h>
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_vout.h>
 
@@ -84,22 +88,22 @@ vlc_module_begin();
     add_float_with_range( "opencv-scale", 1.0, 0.1, 2.0, NULL,
                           N_("Scale factor (0.1-2.0)"),
                           N_("Ammount by which to scale the picture before sending it to the internal OpenCV filter"),
-                          VLC_FALSE );
+                          false );
     add_string( "opencv-chroma", "input", NULL,
                           N_("OpenCV filter chroma"),
-                          N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), VLC_FALSE);
+                          N_("Chroma to convert picture to before sending it to the internal OpenCV filter"), false);
         change_string_list( chroma_list, chroma_list_text, 0);
     add_string( "opencv-output", "input", NULL,
                           N_("Wrapper filter output"),
-                          N_("Determines what (if any) video is displayed by the wrapper filter"), VLC_FALSE);
+                          N_("Determines what (if any) video is displayed by the wrapper filter"), false);
         change_string_list( output_list, output_list_text, 0);
     add_string( "opencv-verbosity", "error", NULL,
                           N_("Wrapper filter verbosity"),
-                          N_("Determines wrapper filter verbosity level"), VLC_FALSE);
+                          N_("Determines wrapper filter verbosity level"), false);
         change_string_list( verbosity_list, verbosity_list_text, 0);
     add_string( "opencv-filter-name", "none", NULL,
                           N_("OpenCV internal filter name"),
-                          N_("Name of internal OpenCV plugin filter to use"), VLC_FALSE);
+                          N_("Name of internal OpenCV plugin filter to use"), false);
 vlc_module_end();
 
 
@@ -339,7 +343,7 @@ static int Init( vout_thread_t *p_vout )
         msg_Err( p_vout, "can't open internal opencv filter: %s", p_vout->p_sys->psz_inner_name );
         p_vout->p_sys->psz_inner_name = NULL;
         vlc_object_detach( p_sys->p_opencv );
-        vlc_object_destroy( p_sys->p_opencv );
+        vlc_object_release( p_sys->p_opencv );
         p_sys->p_opencv = NULL;
     }
 
@@ -385,7 +389,7 @@ static void End( vout_thread_t *p_vout )
         if( p_vout->p_sys->p_opencv->p_module )
             module_Unneed( p_vout->p_sys->p_opencv, p_vout->p_sys->p_opencv->p_module );
         vlc_object_detach( p_vout->p_sys->p_opencv );
-        vlc_object_destroy( p_vout->p_sys->p_opencv );
+        vlc_object_release( p_vout->p_sys->p_opencv );
         p_vout->p_sys->p_opencv = NULL;
     }