PR #20865 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20865 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20865.patch
>From 22c76f902917bf18c82a8295bda883dde7ce7071 Mon Sep 17 00:00:00 2001 From: Zhao Zhili <[email protected]> Date: Sat, 8 Nov 2025 22:35:38 +0800 Subject: [PATCH] avfilter/vf_libopencv: bump to opencv4 --- configure | 7 ++----- libavfilter/vf_libopencv.c | 5 ----- 2 files changed, 2 insertions(+), 10 deletions(-) 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" -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
