Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-02-09 00:17:00 +01:00
Code Issues Projects Releases Wiki Activity

Use smarter logic for default ffmpeg handling (#13748)

Browse Source
This commit is contained in:
Nicolas Mowen 2024-09-15 09:01:15 -06:00 committed by GitHub
parent c17524bc3c
commit fc145016ea
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/main/rootfs/usr/local/go2rtc/create_config.py
View File

@ -2,6 +2,7 @@
import json import json
import os import os
import shutil
import sys import sys
from pathlib import Path from pathlib import Path
@ -108,7 +109,7 @@ else:
# ensure ffmpeg path is set correctly # ensure ffmpeg path is set correctly
path = config.get("ffmpeg", {}).get("path", "default") path = config.get("ffmpeg", {}).get("path", "default")
if path == "default": if path == "default":
if int(os.getenv("", "59") or "59") >= 59: if shutil.which("ffmpeg") is None:
ffmpeg_path = "/usr/lib/ffmpeg/7.0/bin/ffmpeg" ffmpeg_path = "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
else: else:
ffmpeg_path = "ffmpeg" ffmpeg_path = "ffmpeg"

3
frigate/config.py
View File

@ -3,6 +3,7 @@ from __future__ import annotations
import json import json
import logging import logging
import os import os
import shutil
from enum import Enum from enum import Enum
from pathlib import Path from pathlib import Path
from typing import Any, Dict, List, Optional, Tuple, Union from typing import Any, Dict, List, Optional, Tuple, Union
@ -888,7 +889,7 @@ class FfmpegConfig(FrigateBaseModel):
@property @property
def ffmpeg_path(self) -> str: def ffmpeg_path(self) -> str:
if self.path == "default": if self.path == "default":
if int(os.getenv("LIBAVFORMAT_VERSION_MAJOR", "59")) >= 59: if shutil.which("ffmpeg") is None:
return "/usr/lib/ffmpeg/7.0/bin/ffmpeg" return "/usr/lib/ffmpeg/7.0/bin/ffmpeg"
else: else:
return "ffmpeg" return "ffmpeg"