administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-09-27 03:08:56 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Upgrade ffmpeg to 8 by default (#23393)

Browse Source 
* Upgrade to ffmpeg 8

* Remove workaround

* Cleanup ffmpeg version resolution

* Include older 7.0 for testing purposes

* include
This commit is contained in:
Nicolas Mowen
2026-06-03 12:28:28 -05:00
committed by GitHub
parent 3f0ebb3577
commit a08e2d7529
10 changed files with 52 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docker/main/rootfs/usr/local/ffmpeg/get_ffmpeg_path.py
+2 -11
View File
@@ -5,11 +5,7 @@ from typing import Any
from ruamel.yaml import YAML
sys.path.insert(0, "/opt/frigate")
from frigate.const import (
DEFAULT_FFMPEG_VERSION,
INCLUDED_FFMPEG_VERSIONS,
)
from frigate.util.config import find_config_file
from frigate.util.config import find_config_file, resolve_ffmpeg_path
sys.path.remove("/opt/frigate")
@@ -29,9 +25,4 @@ except FileNotFoundError:
config: dict[str, Any] = {}
path = config.get("ffmpeg", {}).get("path", "default")
if path == "default":
print(f"/usr/lib/ffmpeg/{DEFAULT_FFMPEG_VERSION}/bin/ffmpeg")
elif path in INCLUDED_FFMPEG_VERSIONS:
print(f"/usr/lib/ffmpeg/{path}/bin/ffmpeg")
else:
print(f"{path}/bin/ffmpeg")
print(resolve_ffmpeg_path(path, "ffmpeg"))