From d3755fd5ed0a0972c2225f60b75b9df93e6f44b9 Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Fri, 13 Sep 2024 10:42:15 -0600
Subject: [PATCH] Cleanup

---
 docker/main/Dockerfile   | 2 +-
 frigate/api/export.py    | 2 --
 frigate/config.py        | 6 ++++--
 frigate/util/services.py | 7 ++++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/docker/main/Dockerfile b/docker/main/Dockerfile
index 9ad818785..66aeee351 100644
--- a/docker/main/Dockerfile
+++ b/docker/main/Dockerfile
@@ -201,7 +201,7 @@ ENV ALLOW_RESET=True
 # Disable tokenizer parallelism warning
 ENV TOKENIZERS_PARALLELISM=true
 
-ENV ENV LIBAVFORMAT_VERSION_MAJOR=60
+ENV LIBAVFORMAT_VERSION_MAJOR=60
 
 # Install dependencies
 RUN --mount=type=bind,source=docker/main/install_deps.sh,target=/deps/install_deps.sh \
diff --git a/frigate/api/export.py b/frigate/api/export.py
index 2c881a81d..0993a3a87 100644
--- a/frigate/api/export.py
+++ b/frigate/api/export.py
@@ -14,7 +14,6 @@ from flask import (
 )
 from peewee import DoesNotExist
 
-from frigate.config import FrigateConfig
 from frigate.const import EXPORT_DIR
 from frigate.models import Export, Recordings
 from frigate.record.export import PlaybackFactorEnum, RecordingExporter
@@ -145,7 +144,6 @@ def export_delete(id: str):
             404,
         )
 
-    config: FrigateConfig = current_app.frigate_config
     files_in_use = []
     for process in psutil.process_iter():
         try:
diff --git a/frigate/config.py b/frigate/config.py
index 7d3633617..5794debff 100644
--- a/frigate/config.py
+++ b/frigate/config.py
@@ -1223,7 +1223,7 @@ class CameraConfig(FrigateBaseModel):
         )
 
         cmd = (
-            ["ffmpeg"]
+            [self.ffmpeg.ffmpeg_path]
             + global_args
             + hwaccel_args
             + input_args
@@ -1549,7 +1549,9 @@ class FrigateConfig(FrigateBaseModel):
                 if need_detect_dimensions or need_record_fourcc:
                     stream_info = {"width": 0, "height": 0, "fourcc": None}
                     try:
-                        stream_info = stream_info_retriever.get_stream_info(config.ffmpeg, input.path)
+                        stream_info = stream_info_retriever.get_stream_info(
+                            config.ffmpeg, input.path
+                        )
                     except Exception:
                         logger.warn(
                             f"Error detecting stream parameters automatically for {input.path} Applying default values."
diff --git a/frigate/util/services.py b/frigate/util/services.py
index c7b2b7eaa..03787d248 100644
--- a/frigate/util/services.py
+++ b/frigate/util/services.py
@@ -15,7 +15,6 @@ import psutil
 import py3nvml.py3nvml as nvml
 import requests
 
-from frigate.config import FfmpegConfig
 from frigate.const import (
     DRIVER_AMD,
     DRIVER_ENV_VAR,
@@ -379,7 +378,7 @@ def get_jetson_stats() -> dict[int, dict]:
     return results
 
 
-def ffprobe_stream(ffmpeg: FfmpegConfig, path: str) -> sp.CompletedProcess:
+def ffprobe_stream(ffmpeg, path: str) -> sp.CompletedProcess:
     """Run ffprobe on stream."""
     clean_path = escape_special_characters(path)
     ffprobe_cmd = [
@@ -439,7 +438,9 @@ def auto_detect_hwaccel() -> str:
     return ""
 
 
-async def get_video_properties(ffmpeg: FfmpegConfig, url: str, get_duration: bool = False) -> dict[str, any]:
+async def get_video_properties(
+    ffmpeg, url: str, get_duration: bool = False
+) -> dict[str, any]:
     async def calculate_duration(video: Optional[any]) -> float:
         duration = None