From d5acd11164e29ea98d66ca97446aad4d96ed70b4 Mon Sep 17 00:00:00 2001 From: Nicolas Mowen Date: Sat, 14 Sep 2024 12:22:03 -0600 Subject: [PATCH] Ffmpeg fixes (#13739) * Only include hwaccel args if detect is being used * Include both libmfx libraries --- docker/main/install_deps.sh | 2 +- frigate/config.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh index fbfcd8689..34f2e093e 100755 --- a/docker/main/install_deps.sh +++ b/docker/main/install_deps.sh @@ -68,7 +68,7 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then apt-get -qq update apt-get -qq install --no-install-recommends --no-install-suggests -y \ intel-opencl-icd intel-media-va-driver-non-free i965-va-driver \ - libmfx-gen1.2 onevpl-tools intel-gpu-tools \ + libmfx-gen1.2 libmfx1 onevpl-tools intel-gpu-tools \ libva-drm2 \ mesa-va-drivers radeontop diff --git a/frigate/config.py b/frigate/config.py index 5794debff..7e557f0a3 100644 --- a/frigate/config.py +++ b/frigate/config.py @@ -1225,7 +1225,7 @@ class CameraConfig(FrigateBaseModel): cmd = ( [self.ffmpeg.ffmpeg_path] + global_args - + hwaccel_args + + (hwaccel_args if "detect" in ffmpeg_input.roles else []) + input_args + ["-i", escape_special_characters(ffmpeg_input.path)] + ffmpeg_output_args