Ffmpeg fixes (#13739)

* Only include hwaccel args if detect is being used

* Include both libmfx libraries
This commit is contained in:
Nicolas Mowen 2024-09-14 12:22:03 -06:00 committed by GitHub
parent 2a66923524
commit d5acd11164
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions

View File

@ -68,7 +68,7 @@ if [[ "${TARGETARCH}" == "amd64" ]]; then
apt-get -qq update apt-get -qq update
apt-get -qq install --no-install-recommends --no-install-suggests -y \ apt-get -qq install --no-install-recommends --no-install-suggests -y \
intel-opencl-icd intel-media-va-driver-non-free i965-va-driver \ 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 \ libva-drm2 \
mesa-va-drivers radeontop mesa-va-drivers radeontop

View File

@ -1225,7 +1225,7 @@ class CameraConfig(FrigateBaseModel):
cmd = ( cmd = (
[self.ffmpeg.ffmpeg_path] [self.ffmpeg.ffmpeg_path]
+ global_args + global_args
+ hwaccel_args + (hwaccel_args if "detect" in ffmpeg_input.roles else [])
+ input_args + input_args
+ ["-i", escape_special_characters(ffmpeg_input.path)] + ["-i", escape_special_characters(ffmpeg_input.path)]
+ ffmpeg_output_args + ffmpeg_output_args