* Preamble
*****************************************************************************/
-#include <cxcore.h>
-#include <cv.h>
-#include <highgui.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_vout.h>
+#include <vlc_modules.h>
#include <math.h>
#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>
/*****************************************************************************
{
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;
}
//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;
}
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 );
}