X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fopencv_wrapper.c;h=3cd985f104bf9a082fa390e72022ecb89bbd0233;hb=08d51eaa6e33e3c47c6d00de5fc8424a27955912;hp=7b71058aa4c2cccd1b5cd25db76522645a9e72ea;hpb=27cdd6eb494feb8da6ea6fd4112b1b066b5f4f3a;p=vlc

diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c
index 7b71058aa4..3cd985f104 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,12 +36,13 @@
 #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>
+
 
 /*****************************************************************************
  * Local prototypes
@@ -565,7 +562,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 );
     }