X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Fvideo_filter%2Fopencv_wrapper.c;h=58d5d482ae227984df7e95e25c5c6ccd8eb478be;hb=ce1b1bda347a6e4540b8c418b70f2b46f34726c7;hp=a869607f03ee77b308ba84b58b71d3c47c53613d;hpb=89ce0ea53b4a46e71f209f78165e46528ec3b839;p=vlc

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index a869607f03..58d5d482ae 100644
--- a/modules/video_filter/opencv_wrapper.c
+++ b/modules/video_filter/opencv_wrapper.c
@@ -24,10 +24,6 @@
  * Preamble
  *****************************************************************************/
 
-#include <cxcore.h>
-#include <cv.h>
-#include <highgui.h>
-
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -40,11 +36,11 @@
 #include <time.h>
 
 #include <vlc_filter.h>
-#include "filter_common.h"
-#include <vlc_charset.h>
 #include <vlc_image.h>
 #include <vlc_input.h>
-#include <vlc_playlist.h>
+
+#include <cxcore.h>
+#include <cv.h>
 
 
 /*****************************************************************************
@@ -339,7 +335,6 @@ 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_release( p_sys->p_opencv );
         p_sys->p_opencv = NULL;
     }
@@ -381,7 +376,6 @@ static void End( vout_thread_t *p_vout )
         //release the internal opencv filter
         if( p_sys->p_opencv->p_module )
             module_unneed( p_sys->p_opencv, p_sys->p_opencv->p_module );
-        vlc_object_detach( p_sys->p_opencv );
         vlc_object_release( p_sys->p_opencv );
         p_sys->p_opencv = NULL;
     }
@@ -567,7 +561,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
         if ((p_vout->p_sys->p_opencv) && (p_vout->p_sys->p_opencv->p_module))
             p_vout->p_sys->p_opencv->pf_video_filter( p_vout->p_sys->p_opencv, &(p_vout->p_sys->hacked_pic));
         //copy the processed image into the output image
-        if ((p_vout->p_sys->p_proc_image) && (p_vout->p_sys->p_proc_image->p_data))
+        if ((p_vout->p_sys->p_proc_image) && (p_vout->p_sys->p_proc_image->i_planes > 0))
             picture_Copy( p_outpic, p_vout->p_sys->p_proc_image );
     }