From 021c24db8251efd2782380f9ba529249946aa49b Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Sat, 18 Mar 2023 20:47:46 +0000 Subject: [PATCH] Update standard FFmpeg and enable AV1 decoders --- FFmpeg | 2 +- nv-codec-headers | 2 +- scripts/build-deps.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FFmpeg b/FFmpeg index 575f20f..a2f02ff 160000 --- a/FFmpeg +++ b/FFmpeg @@ -1 +1 @@ -Subproject commit 575f20ff4fe85b513786537e18103b28e44b91e6 +Subproject commit a2f02ffcaeeaa573af6b651761e52ed13692f7ad diff --git a/nv-codec-headers b/nv-codec-headers index 0cd5c2b..27b5db6 160000 --- a/nv-codec-headers +++ b/nv-codec-headers @@ -1 +1 @@ -Subproject commit 0cd5c2b7c30d580d09348c92d8facd7a39957f01 +Subproject commit 27b5db61c9eb4b98d3f565cecf8713b4ecabd990 diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh index 8d171f7..5310e40 100755 --- a/scripts/build-deps.sh +++ b/scripts/build-deps.sh @@ -1,6 +1,6 @@ set -e -BASE_FFMPEG_ARGS="--enable-pic --enable-static --disable-shared --disable-all --enable-avcodec --enable-decoder=h264 --enable-decoder=hevc --enable-libdrm --enable-decoder=h264_v4l2m2m --enable-decoder=hevc_v4l2m2m --extra-cflags=-I/usr/include/libdrm" +BASE_FFMPEG_ARGS="--enable-pic --enable-static --disable-shared --disable-all --enable-avcodec --enable-decoder=h264 --enable-decoder=hevc --enable-decoder=av1 --enable-libdrm --enable-decoder=h264_v4l2m2m --enable-decoder=hevc_v4l2m2m --extra-cflags=-I/usr/include/libdrm" echo "Building dependencies for $TARGET" if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then @@ -32,7 +32,7 @@ elif [ "$TARGET" == "desktop" ]; then make install # Enable VAAPI, VDPAU, and NVDEC decoders - EXTRA_FFMPEG_ARGS="--enable-nvdec --enable-hwaccel=h264_nvdec --enable-hwaccel=hevc_nvdec --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau" + EXTRA_FFMPEG_ARGS="--enable-nvdec --enable-hwaccel=h264_nvdec --enable-hwaccel=hevc_nvdec --enable-hwaccel=av1_nvdec --enable-hwaccel=h264_vaapi --enable-hwaccel=hevc_vaapi --enable-hwaccel=av1_vaapi --enable-hwaccel=h264_vdpau --enable-hwaccel=hevc_vdpau --enable-hwaccel=av1_vdpau" else echo "Unrecognized target: $TARGET" exit 1