Skip to content

Commit 8c243ab

Browse files
thomshuttvictorges
andauthored
Revert "Bump ffmpeg version and nv-codec-headers" (#2989)
* Revert "Bump ffmpeg version and nv-codec-headers (#2973)" This reverts commit cad6713. * Revert "Update CUDA build version from 11.7.1 to 12.0.0 (#2978)" This reverts commit 6c09a9f. * Reapply "Update CUDA build version from 11.7.1 to 12.0.0 (#2978)" This reverts commit ebbf210. * Force ffmpeg reinstall * Revert "Force ffmpeg reinstall" This reverts commit 5adb9a5. --------- Co-authored-by: Victor Elias <victorgelias@gmail.com>
1 parent 2572d97 commit 8c243ab

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

install_ffmpeg.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ if [[ "$GOOS" != "darwin" ]]; then
116116
if [[ ! -e "$ROOT/nv-codec-headers" ]]; then
117117
git clone https://git.videolan.org/git/ffmpeg/nv-codec-headers.git "$ROOT/nv-codec-headers"
118118
cd $ROOT/nv-codec-headers
119-
git checkout n12.1.14.0
119+
git checkout n9.1.23.1
120120
make -e PREFIX="$ROOT/compiled"
121121
make install -e PREFIX="$ROOT/compiled"
122122
fi
@@ -203,8 +203,9 @@ else
203203
fi
204204

205205
if [[ ! -e "$ROOT/ffmpeg/libavcodec/libavcodec.a" ]]; then
206-
git clone https://github.com/livepeer/FFmpeg-6.1.1.git "$ROOT/ffmpeg" || echo "FFmpeg dir already exists"
206+
git clone https://github.com/livepeer/FFmpeg.git "$ROOT/ffmpeg" || echo "FFmpeg dir already exists"
207207
cd "$ROOT/ffmpeg"
208+
git checkout 2e18d069668c143f3c251067abd25389e411d022
208209
./configure ${TARGET_OS:-} $DISABLE_FFMPEG_COMPONENTS --fatal-warnings \
209210
--enable-libx264 --enable-gpl \
210211
--enable-protocol=rtmp,file,pipe \

0 commit comments

Comments
 (0)