From cad6713174fc351850ae5a2f82b0f6ab306fc133 Mon Sep 17 00:00:00 2001 From: Thom Shutt Date: Fri, 8 Mar 2024 13:09:55 +0000 Subject: [PATCH] Bump ffmpeg version and nv-codec-headers (#2973) --- install_ffmpeg.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/install_ffmpeg.sh b/install_ffmpeg.sh index af66bd0b88..03b4e0b301 100755 --- a/install_ffmpeg.sh +++ b/install_ffmpeg.sh @@ -116,7 +116,7 @@ if [[ "$GOOS" != "darwin" ]]; then if [[ ! -e "$ROOT/nv-codec-headers" ]]; then git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git "$ROOT/nv-codec-headers" cd $ROOT/nv-codec-headers - git checkout n9.1.23.1 + git checkout n12.1.14.0 make -e PREFIX="$ROOT/compiled" make install -e PREFIX="$ROOT/compiled" fi @@ -203,9 +203,8 @@ else fi if [[ ! -e "$ROOT/ffmpeg/libavcodec/libavcodec.a" ]]; then - git clone https://github.com/livepeer/FFmpeg.git "$ROOT/ffmpeg" || echo "FFmpeg dir already exists" + git clone https://github.com/livepeer/FFmpeg-6.1.1.git "$ROOT/ffmpeg" || echo "FFmpeg dir already exists" cd "$ROOT/ffmpeg" - git checkout 2e18d069668c143f3c251067abd25389e411d022 ./configure ${TARGET_OS:-} $DISABLE_FFMPEG_COMPONENTS --fatal-warnings \ --enable-libx264 --enable-gpl \ --enable-protocol=rtmp,file,pipe \