diff options
| author | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-21 23:17:47 +0100 |
|---|---|---|
| committer | Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com> | 2016-01-25 23:49:22 +0100 |
| commit | 38622007c4bdfbdc9e688bf5bb1cdcab0f045e67 (patch) | |
| tree | fd93ae2f9675b8e981f19c1f750f5b67cc0c3c6e | |
| parent | 73e4565dff92d372e53a2073b65a3c88d0ac8baa (diff) | |
| download | ffmpeg-38622007c4bdfbdc9e688bf5bb1cdcab0f045e67.tar.gz | |
vf_libopencv: add support for opencv 3
It dropped the old headers, but the replacements are already available
with opencv 2.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
| -rwxr-xr-x | configure | 5 | ||||
| -rw-r--r-- | libavfilter/vf_libopencv.c | 6 |
2 files changed, 10 insertions, 1 deletions
@@ -1774,6 +1774,7 @@ HEADERS_LIST=" machine_ioctl_bt848_h machine_ioctl_meteor_h malloc_h + opencv2_core_core_c_h openjpeg_2_1_openjpeg_h openjpeg_2_0_openjpeg_h openjpeg_1_5_openjpeg_h @@ -5481,7 +5482,9 @@ enabled libmp3lame && require "libmp3lame >= 3.98.3" lame/lame.h lame_set 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/cxcore.h cvCreateImageHeader +enabled libopencv && { check_header opencv2/core/core_c.h && + require_pkg_config opencv opencv2/core/core_c.h cvCreateImageHeader || + require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; } enabled libopenh264 && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion enabled libopenjpeg && { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC || diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c index be27552995..f8ae9d5a6d 100644 --- a/libavfilter/vf_libopencv.c +++ b/libavfilter/vf_libopencv.c @@ -23,8 +23,14 @@ * libopencv wrapper functions */ +#include "config.h" +#if HAVE_OPENCV2_CORE_CORE_C_H +#include <opencv2/core/core_c.h> +#include <opencv2/imgproc/imgproc_c.h> +#else #include <opencv/cv.h> #include <opencv/cxcore.h> +#endif #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/file.h" |