at master 47 lines 1.9 kB view raw
1diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py 2index 04bbfac7..396bcc4b 100644 3--- a/frigate/config/camera/ffmpeg.py 4+++ b/frigate/config/camera/ffmpeg.py 5@@ -1,4 +1,5 @@ 6 from enum import Enum 7+from os.path import join 8 from typing import Union 9 10 from pydantic import Field, field_validator 11@@ -69,21 +70,11 @@ class FfmpegConfig(FrigateBaseModel): 12 13 @property 14 def ffmpeg_path(self) -> str: 15- if self.path == "default": 16- return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg" 17- elif self.path in INCLUDED_FFMPEG_VERSIONS: 18- return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg" 19- else: 20- return f"{self.path}/bin/ffmpeg" 21+ return join(self.path, "bin/ffmpeg") 22 23 @property 24 def ffprobe_path(self) -> str: 25- if self.path == "default": 26- return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe" 27- elif self.path in INCLUDED_FFMPEG_VERSIONS: 28- return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe" 29- else: 30- return f"{self.path}/bin/ffprobe" 31+ return join(self.path, "bin/ffprobe") 32 33 34 class CameraRoleEnum(str, Enum): 35diff --git a/frigate/record/export.py b/frigate/record/export.py 36index 0d3f96da..463bcff4 100644 37--- a/frigate/record/export.py 38+++ b/frigate/record/export.py 39@@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread): 40 minutes = int(diff / 60) 41 seconds = int(diff % 60) 42 ffmpeg_cmd = [ 43- "/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support 44+ self.config.ffmpeg.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support 45 "-hide_banner", 46 "-loglevel", 47 "warning",