From dee9f245cd463669dbf707e05a2872d4466cbf9b Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 14 八月 2025 09:44:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
framework/pom.xml | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/framework/pom.xml b/framework/pom.xml
index c746ce1..f52589c 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -15,16 +15,16 @@
<packaging>jar</packaging>
<dependencies>
- <dependency>
- <groupId>org.bytedeco</groupId>
- <artifactId>javacv-platform</artifactId>
- <version>1.5.9</version>
- </dependency>
- <dependency>
- <groupId>org.bytedeco</groupId>
- <artifactId>ffmpeg-platform</artifactId>
- <version>6.0-1.5.9</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.bytedeco</groupId>-->
+<!-- <artifactId>javacv-platform</artifactId>-->
+<!-- <version>1.5.9</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.bytedeco</groupId>-->
+<!-- <artifactId>ffmpeg-platform</artifactId>-->
+<!-- <version>6.0-1.5.9</version>-->
+<!-- </dependency>-->
<!-- cos sts -->
<dependency>
<groupId>com.qcloud</groupId>
--
Gitblit v1.8.0