From 261e46fdc2e9f2019ee9e7e2c72672a4bb744aff Mon Sep 17 00:00:00 2001
From: haotian <2421912570@qq.com>
Date: Thu, 26 Feb 2026 22:03:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BE=9D=E8=B5=96=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/install_deps.sh | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
index ba0ff9e..23d3a8b 100755
--- a/scripts/install_deps.sh
+++ b/scripts/install_deps.sh
@@ -72,12 +72,11 @@ install_basic_tools() {
         python3-dev \
         python3-venv
     
-    # 其他工具
+    # 其他工具 (注意: ffmpeg稍后会从源码编译安装)
     apt-get install -y \
         htop \
         vim \
         net-tools \
-        ffmpeg \
         v4l-utils
     
     echo -e "${GREEN}✓${NC} 基础工具安装完成"
@@ -195,6 +194,14 @@ install_rknn() {
 install_ffmpeg_rk() {
     echo -e "${YELLOW}[5/6] 安装 FFmpeg (带Rockchip支持)...${NC}"
     
+    # 检查并处理系统预装的ffmpeg
+    echo "  检查系统ffmpeg..."
+    if dpkg -l | grep -q "^ii  ffmpeg "; then
+        echo "  发现系统预装ffmpeg，解除保留状态..."
+        apt-mark unhold ffmpeg 2>/dev/null || true
+        apt-get remove -y ffmpeg 2>/dev/null || true
+    fi
+    
     cd "$TEMP_DIR"
     
     # 检查是否已有ffmpeg-rockchip