From 082b1eb40ee64142c758f1a629bd8c0ce8faa450 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Sun, 15 Sep 2024 11:35:50 -0600
Subject: [PATCH] Use ffmpeg 6

---
 docker/main/rootfs/usr/local/go2rtc/create_config.py |  6 +++---
 frigate/config.py                                    | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docker/main/rootfs/usr/local/go2rtc/create_config.py b/docker/main/rootfs/usr/local/go2rtc/create_config.py
index f1b0cfe53..d33e4da9e 100644
--- a/docker/main/rootfs/usr/local/go2rtc/create_config.py
+++ b/docker/main/rootfs/usr/local/go2rtc/create_config.py
@@ -110,11 +110,11 @@ else:
 path = config.get("ffmpeg", {}).get("path", "default")
 if path == "default":
     if shutil.which("ffmpeg") is None:
-        ffmpeg_path = "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+        ffmpeg_path = "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
     else:
         ffmpeg_path = "ffmpeg"
-elif path == "7.0":
-    ffmpeg_path = "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+elif path == "6.0":
+    ffmpeg_path = "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
 elif path == "5.0":
     ffmpeg_path = "/usr/lib/ffmpeg/5.0/bin/ffmpeg"
 else:
diff --git a/frigate/config.py b/frigate/config.py
index b63bbb44e..8c66931c3 100644
--- a/frigate/config.py
+++ b/frigate/config.py
@@ -890,11 +890,11 @@ class FfmpegConfig(FrigateBaseModel):
     def ffmpeg_path(self) -> str:
         if self.path == "default":
             if shutil.which("ffmpeg") is None:
-                return "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+                return "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
             else:
                 return "ffmpeg"
-        elif self.path == "7.0":
-            return "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
+        elif self.path == "6.0":
+            return "/usr/lib/ffmpeg/6.0/bin/ffmpeg"
         elif self.path == "5.0":
             return "/usr/lib/ffmpeg/5.0/bin/ffmpeg"
         else:
@@ -904,11 +904,11 @@ class FfmpegConfig(FrigateBaseModel):
     def ffprobe_path(self) -> str:
         if self.path == "default":
             if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59:
-                return "/usr/lib/ffmpeg/7.0/bin/ffprobe"
+                return "/usr/lib/ffmpeg/6.0/bin/ffprobe"
             else:
                 return "ffprobe"
-        elif self.path == "7.0":
-            return "/usr/lib/ffmpeg/7.0/bin/ffprobe"
+        elif self.path == "6.0":
+            return "/usr/lib/ffmpeg/6.0/bin/ffprobe"
         elif self.path == "5.0":
             return "/usr/lib/ffmpeg/5.0/bin/ffprobe"
         else: