Browse code

vf_libopencv: prefer opencv/cxcore.h over cxtypes.h

Require the presence of opencv/cxcore.h in place of opencv/cxtypes.h,
which has been removed. Fix compilation with libopencv > 2.1.0.

Fix trac issue #221.

Stefano Sabatini authored on 2011/05/20 18:36:16
Showing 2 changed files
... ...
@@ -2919,7 +2919,7 @@ enabled libmp3lame && require  "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_q
2919 2919
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
2920 2920
 enabled libopencore_amrnb  && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb
2921 2921
 enabled libopencore_amrwb  && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb
2922
-enabled libopencv  && require_pkg_config opencv opencv/cv.h cvCreateImageHeader
2922
+enabled libopencv  && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader
2923 2923
 enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg
2924 2924
 enabled librtmp    && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket
2925 2925
 enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init
... ...
@@ -26,7 +26,7 @@
26 26
 /* #define DEBUG */
27 27
 
28 28
 #include <opencv/cv.h>
29
-#include <opencv/cxtypes.h>
29
+#include <opencv/cxcore.h>
30 30
 #include "libavutil/avstring.h"
31 31
 #include "libavutil/file.h"
32 32
 #include "avfilter.h"