Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Correctly calculate ffmpeg version based on ffmpeg path #16041

Merged
merged 2 commits into from
Jan 19, 2025
+58 −3
Merged

Correctly calculate ffmpeg version based on ffmpeg path #16041

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2dca6b
Correctly calculate ffmpeg version based on ffmpeg path
NickM-27 Jan 18, 2025
38c8d79
Formatting
NickM-27 Jan 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Formatting
@NickM-27
NickM-27 committed Jan 18, 2025
commit 38c8d79b56b08b52ac732adf74dbab10474b4017
2 changes: 1 addition & 1 deletion docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run
View file
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ function migrate_db_path() {
}

function set_libva_version() {
local ffmpeg_path=$(python3 /usr/local/ffmpeg/get_ffmpeg_path.py)
local ffmpeg_path=$(python3 docker/main/rootfs/usr/local/ffmpeg/get_ffmpeg_path.py)
export LIBAVFORMAT_VERSION_MAJOR=$($ffmpeg_path -version | grep -Po "libavformat\W+\K\d+")
}

1 change: 0 additions & 1 deletion docker/main/rootfs/usr/local/ffmpeg/get_ffmpeg_path.py
View file
Original file line number Diff line number Diff line change
@@ -43,4 +43,3 @@
print(f"/usr/lib/ffmpeg/{path}/bin/ffmpeg")
else:
print(f"{path}/bin/ffmpeg")