diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-20 11:36:16 +0200 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-20 11:54:53 +0200 |
| commit | f1b3f33d48b366dd7b3b915b4de90d9ad4c4ae39 (patch) | |
| tree | 31f224fe63a2e819049c1276a537c5bce56a693c | |
| parent | 125d807660996b879c4762c3a15c4bb485e13f4c (diff) | |
| download | ffmpeg-f1b3f33d48b366dd7b3b915b4de90d9ad4c4ae39.tar.gz | |
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.
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavfilter/vf_libopencv.c | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -2919,7 +2919,7 @@ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set_VBR_q enabled libnut && require libnut libnut.h nut_demuxer_init -lnut enabled libopencore_amrnb && require libopencore_amrnb opencore-amrnb/interf_dec.h Decoder_Interface_init -lopencore-amrnb enabled libopencore_amrwb && require libopencore_amrwb opencore-amrwb/dec_if.h D_IF_init -lopencore-amrwb -enabled libopencv && require_pkg_config opencv opencv/cv.h cvCreateImageHeader +enabled libopencv && require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader enabled libopenjpeg && require libopenjpeg openjpeg.h opj_version -lopenjpeg enabled librtmp && require_pkg_config librtmp librtmp/rtmp.h RTMP_Socket enabled libschroedinger && require_pkg_config schroedinger-1.0 schroedinger/schro.h schro_init diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index 55e0a7f757..b789c8e19c 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -26,7 +26,7 @@ /* #define DEBUG */ #include <opencv/cv.h> -#include <opencv/cxtypes.h> +#include <opencv/cxcore.h> #include "libavutil/avstring.h" #include "libavutil/file.h" #include "avfilter.h" |