Skip to content

Commit

Permalink
Revert "Bump ffmpeg version and nv-codec-headers" (#2989)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
thomshutt and victorges authored Apr 2, 2024
1 parent 2572d97 commit 8c243ab
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions install_ffmpeg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 n12.1.14.0
git checkout n9.1.23.1
make -e PREFIX="$ROOT/compiled"
make install -e PREFIX="$ROOT/compiled"
fi
Expand Down Expand Up @@ -203,8 +203,9 @@ else
fi

if [[ ! -e "$ROOT/ffmpeg/libavcodec/libavcodec.a" ]]; then
git clone https://github.com/livepeer/FFmpeg-6.1.1.git "$ROOT/ffmpeg" || echo "FFmpeg dir already exists"
git clone https://github.com/livepeer/FFmpeg.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 \
Expand Down

0 comments on commit 8c243ab

Please sign in to comment.