From 0037bf8fc663566a60e2322bbe3f9a9997c69051 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 17 Mar 2023 05:32:02 +0000 Subject: [PATCH] Update RPi FFmpeg to 5.1.2 branch --- FFmpeg-rpi | 2 +- scripts/build-deps.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/FFmpeg-rpi b/FFmpeg-rpi index f9aae9b..dc2ac30 160000 --- a/FFmpeg-rpi +++ b/FFmpeg-rpi @@ -1 +1 @@ -Subproject commit f9aae9be4420c8f6658687c819f88aa0f1b15b7a +Subproject commit dc2ac30c017df703defdb10bf014ac6ec02fc1eb diff --git a/scripts/build-deps.sh b/scripts/build-deps.sh index b53b511..8d171f7 100755 --- a/scripts/build-deps.sh +++ b/scripts/build-deps.sh @@ -15,13 +15,14 @@ if [ "$TARGET" == "rpi" ] || [ "$TARGET" == "rpi64" ]; then # We also have to patch the FFmpeg configure script since it doesn't use pkg-config sed -i 's|add_ldflags -L/opt/vc/lib/|add_ldflags -L/opt/vc/lib/ -pthread|g' /opt/FFmpeg/configure + sed -i 's|-lmmal_vc_client|-lmmal_vc_client -lbcm_host -lvcos -lvcsm -lvchostif -lvchiq_arm|g' /opt/FFmpeg/configure fi # Copy libraspberrypi-dev pkgconfig files into the default location mkdir -p /usr/local/lib/pkgconfig cp /opt/vc/lib/pkgconfig/* /usr/local/lib/pkgconfig/ # Enable MMAL and VL42 stateless decoders - EXTRA_FFMPEG_ARGS="--enable-mmal --enable-decoder=h264_mmal --disable-rpi --enable-sand --enable-libudev --enable-v4l2-request --enable-hwaccel=h264_v4l2request --enable-hwaccel=hevc_v4l2request" + EXTRA_FFMPEG_ARGS="--enable-mmal --enable-decoder=h264_mmal --enable-sand --enable-libudev --enable-v4l2-request --enable-hwaccel=h264_v4l2request --enable-hwaccel=hevc_v4l2request" elif [ "$TARGET" == "l4t" ]; then # Enable NVV4L2 decoders EXTRA_FFMPEG_ARGS="--enable-nvv4l2 --enable-decoder=h264_nvv4l2 --enable-decoder=hevc_nvv4l2"