From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 6BB0D4C210 for ; Sat, 8 Nov 2025 15:14:53 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'YtIpPc/rTTL6jrTUHeOP4d81yVtlY8EeQp040NDRacM=', expected b'Akd6Eqr4yQBFbukh3H/w8tGb2pIWPnMAMpMjSJ6Z8Ls=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762614884; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=YtIpPc/rTTL6jrTUHeOP4d81yVtlY8EeQp040NDRacM=; b=YkTmOBip0+C7Ki1+/4An20KjZD0nPd2Q6sQLilJD5OcfvesE0LeTcqV/IWRxVfTOTOSjh 78TOR1z6+Ksab1VC3scTKxZxUK8W4Xx/KgxK6Y21h1StWQGe2yDR0GAqpXEHr6y8iyCx4eB 8FRFMqwBCVpWDQF6XRjYdEFwJaJlru/YrAQfPDEe40ZfCGgJ4uK9Byl7xcZJc5Vdv9XgA5N Hfgr6DAQAMZ9hpeLNL22YEZV7wLAMdN7CGBkMLou7gG7Ip+wOuhGUR5ebSdK4F3lI9DWbKy vxT5Garz/0JHGW+jZlsVcmXls4bJNpvSi23uitXVzk3B/8sI83haYbhJTvpA== Received: from [172.19.0.2] (unknown [172.19.0.2]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8A48668FA73; Sat, 8 Nov 2025 17:14:44 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1762614873; b=YGTLJY1crXrmroyyAtmTe9M5kkyin0zLRg5JzZMHTSwRoH0atXHPorqzak42wBcjK0S3x asFW0zVS8Xi3ihpK/k6QDIXei3TdGMtVJZ7dEGWfkA7XcBJqaIvdM7sc3o3o5ztR6jwdef4 OaFL44Igfv5Fhtt29lsVsUcdR+3t1k1dVOa2hDci+06+FAfy7VxBjmsi5//Sx0H06F2rlCO 5OGFwY0rX01dGoN5Gq1kgj1HrnTW7dc251vl7RaJpzvKraggMhGoJJgpL/ZNN8Ol+6tRhqm I9z+m1A96QGWF47+WSajBZ12T0bNzHLYCwlMtExOzMovJKtabL8lTuzMtB+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1762614873; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=2eOKvaSrJw7bTY+sI8AwaC2XY4Zp55kMmA6GvFAj+6w=; b=mNhWTP8rlIBaB+wxlf1hxv7ck7GF6YV8TjopZLd2wgRkmy/JgCkTO7R2X6ZdVRygD0vxw dkTJ3AsQMXhvNcDKwjHtQnCMpTutx2EqMWkLsSQois+iLlzsPtyQM/NvsfkEAuGnLH5+89k b5yG3SqwwzuoFDSdCyQIi9aH7OCJgJydagGfjBdiONJlnzesh5Tobf8IeWGClSSEYK7AT4Q 7qRkmlk8WL25w0hks+6LOjpFXZKtiHhtFR81CyjgVc2JRjN3rsLJa2OWQjjx/AvKpB0dQtK POJOhOFSMe6B5rJB/toa6p34XtWq38aYkxYrZLHYdw6vmqkPmwbkIxsANKgw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1762614865; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=Akd6Eqr4yQBFbukh3H/w8tGb2pIWPnMAMpMjSJ6Z8Ls=; b=Z1gZ3rdpc+ELRyYPIvUfZhTBhNfidH6o/7ZrhXylcNDUQ9PbNJ70OUZXC/Ys9Q6gOIQfS /gRPKDn1ehxjkpNG01Cs2pQfNisL+HHKtmQW8RnFI2UxfPBNjQ9w6/vVgaUmSUDzQN1Sk3z oZxdpS99PMlvndHakL9UclWxmD1t/8z7N8NO+8H866xRYAnyTOwZKw08lyyduP42SMR1cFC 61L5de/1KEb0PgR/ICgSB9m5b5GBHc/k+gk06ihDEeSeTPZkY+PvJu+ZBZM6dWJO1yP1MBq XSjP6QVCZKcbdARP6oXOla8F+pEO01ZIEWM6jL7p18Xme/nMEfyJQ97yD3DQ== Received: from 188d6d40ca7a (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 3D99B68015A for ; Sat, 8 Nov 2025 17:14:25 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sat, 08 Nov 2025 15:14:24 -0000 Message-ID: <176261486540.25.7783456559101742639@2cb04c0e5124> Message-ID-Hash: 3SQCK5OQAWL22BBA35LQAGKTLNTXX6ZE X-Message-ID-Hash: 3SQCK5OQAWL22BBA35LQAGKTLNTXX6ZE X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avfilter/vf_libopencv: bump to opencv4 (PR #20865) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: 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 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 #include -#else -#include -#include -#endif #include "libavutil/avstring.h" #include "libavutil/common.h" #include "libavutil/file.h" -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org