646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
diff --git a/frigate/config/camera/ffmpeg.py b/frigate/config/camera/ffmpeg.py
|
|
index 04bbfac7..396bcc4b 100644
|
|
--- a/frigate/config/camera/ffmpeg.py
|
|
+++ b/frigate/config/camera/ffmpeg.py
|
|
@@ -1,4 +1,5 @@
|
|
from enum import Enum
|
|
+from os.path import join
|
|
from typing import Union
|
|
|
|
from pydantic import Field, field_validator
|
|
@@ -69,21 +70,11 @@ class FfmpegConfig(FrigateBaseModel):
|
|
|
|
@property
|
|
def ffmpeg_path(self) -> str:
|
|
- if self.path == "default":
|
|
- return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg"
|
|
- elif self.path in INCLUDED_FFMPEG_VERSIONS:
|
|
- return f"/usr/lib/ffmpeg/{self.path}/bin/ffmpeg"
|
|
- else:
|
|
- return f"{self.path}/bin/ffmpeg"
|
|
+ return join(self.path, "bin/ffmpeg")
|
|
|
|
@property
|
|
def ffprobe_path(self) -> str:
|
|
- if self.path == "default":
|
|
- return f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffprobe"
|
|
- elif self.path in INCLUDED_FFMPEG_VERSIONS:
|
|
- return f"/usr/lib/ffmpeg/{self.path}/bin/ffprobe"
|
|
- else:
|
|
- return f"{self.path}/bin/ffprobe"
|
|
+ return join(self.path, "bin/ffprobe")
|
|
|
|
|
|
class CameraRoleEnum(str, Enum):
|
|
diff --git a/frigate/record/export.py b/frigate/record/export.py
|
|
index 0d3f96da..463bcff4 100644
|
|
--- a/frigate/record/export.py
|
|
+++ b/frigate/record/export.py
|
|
@@ -126,7 +126,7 @@ class RecordingExporter(threading.Thread):
|
|
minutes = int(diff / 60)
|
|
seconds = int(diff % 60)
|
|
ffmpeg_cmd = [
|
|
- "/usr/lib/ffmpeg/7.0/bin/ffmpeg", # hardcode path for exports thumbnail due to missing libwebp support
|
|
+ self.config.ffmpeg.ffmpeg_path, # hardcode path for exports thumbnail due to missing libwebp support
|
|
"-hide_banner",
|
|
"-loglevel",
|
|
"warning",
|