The branch, master has been updated
via c4ce51ee62205c74604767f1b7dab6a036edac7f (commit)
from 729d0379ab6acb48d55c11ec9bb1b917e94765d6 (commit)
- Log -----------------------------------------------------------------
commit c4ce51ee62205c74604767f1b7dab6a036edac7f
Author: Zhao Zhili <[email protected]>
AuthorDate: Sat Nov 8 22:35:38 2025 +0800
Commit: Zhao Zhili <[email protected]>
CommitDate: Mon Nov 10 04:12:50 2025 +0000
avfilter/vf_libopencv: bump to opencv4
diff --git a/configure b/configure
index af125bc115..659b428cfc 100755
--- a/configure
+++ b/configure
@@ -2349,7 +2349,6 @@ HEADERS_LIST="
linux_dma_buf_h
linux_perf_event_h
malloc_h
- opencv2_core_core_c_h
poll_h
pthread_np_h
sys_hwprobe_h
@@ -7203,10 +7202,8 @@ enabled libnpp && { test_cpp_condition "$(cd
"$source_path"; pwd)/lib
die "ERROR: libnpp support is deprecated,
version 13.0 and up are not supported"; }
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 && { check_headers opencv2/core/core_c.h &&
- { check_pkg_config libopencv opencv
opencv2/core/core_c.h cvCreateImageHeader ||
- require libopencv opencv2/core/core_c.h
cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
- require_pkg_config libopencv opencv
opencv/cxcore.h cvCreateImageHeader; }
+enabled libopencv && { check_pkg_config libopencv opencv4
opencv2/core/core_c.h cvCreateImageHeader ||
+ require libopencv opencv2/core/core_c.h
cvCreateImageHeader -lopencv_core -lopencv_imgproc; }
enabled libopenh264 && require_pkg_config libopenh264 "openh264 >=
1.3.0" wels/codec_api.h WelsGetCodecVersion
enabled libopenjpeg && { check_pkg_config libopenjpeg "libopenjp2 >=
2.1.0" openjpeg.h opj_version ||
{ require_pkg_config libopenjpeg "libopenjp2 >=
2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } }
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
index fb78e10faf..ae8dd49b2c 100644
--- a/libavfilter/vf_libopencv.c
+++ b/libavfilter/vf_libopencv.c
@@ -24,13 +24,8 @@
*/
#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"
-----------------------------------------------------------------------
Summary of changes:
configure | 7 ++-----
libavfilter/vf_libopencv.c | 5 -----
2 files changed, 2 insertions(+), 10 deletions(-)
hooks/post-receive
--
_______________________________________________
ffmpeg-cvslog mailing list -- [email protected]
To unsubscribe send an email to [email protected]
