From a24e9fc910976659370560bb510db0754b8ad923 Mon Sep 17 00:00:00 2001
From: shikong <919411476@qq.com>
Date: Tue, 26 Sep 2023 11:31:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/skcks/docking/gb28181/wvp/config/FfmpegConfig.java  | 7 -------
 .../src/main/resources/application-local.yml               | 2 --
 .../src/main/resources/application.yml                     | 6 ++----
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/FfmpegConfig.java b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/FfmpegConfig.java
index fe70890..bbadfaf 100644
--- a/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/FfmpegConfig.java
+++ b/gb28181-wvp-proxy-service/src/main/java/cn/skcks/docking/gb28181/wvp/config/FfmpegConfig.java
@@ -30,11 +30,4 @@ public class FfmpegConfig {
         private Boolean input = false;
         private Boolean output = false;
     }
-
-    private Task task;
-
-    @Data
-    public static class Task {
-        private Integer max = 4;
-    }
 }
diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml b/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml
index 0086fe8..42fd6dd 100644
--- a/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml
+++ b/gb28181-wvp-proxy-starter/src/main/resources/application-local.yml
@@ -58,8 +58,6 @@ proxy:
         - 10.10.10.20
 #        - 192.168.1.241
 ffmpeg-support:
-  task:
-    max: 4
   ffmpeg: D:\Soft\Captura\ffmpeg\ffmpeg.exe
   ffprobe: D:\Soft\Captura\ffmpeg\ffprobe.exe
   rtp:
diff --git a/gb28181-wvp-proxy-starter/src/main/resources/application.yml b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
index 807a140..db74798 100644
--- a/gb28181-wvp-proxy-starter/src/main/resources/application.yml
+++ b/gb28181-wvp-proxy-starter/src/main/resources/application.yml
@@ -66,10 +66,8 @@ proxy:
 #        - 192.168.1.241
 
 ffmpeg-support:
-  task:
-    max: 4
-#  ffmpeg: /usr/bin/ffmpeg/ffmpeg
-  ffmpeg: C:\ffmpeg\bin\ffmpeg.exe
+  ffmpeg: /usr/bin/ffmpeg/ffmpeg
+#  ffmpeg: C:\ffmpeg\bin\ffmpeg.exe
   ffprobe: /usr/bin/ffmpeg/ffprobe
   rtp:
     input: -re -i