Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Bump ffmpeg version and nv-codec-headers" #2989

Merged
merged 5 commits into from
Apr 2, 2024
Merged

Revert "Bump ffmpeg version and nv-codec-headers" #2989

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81bc19a
Revert "Bump ffmpeg version and nv-codec-headers (#2973)"
thomshutt Mar 29, 2024
ebbf210
Revert "Update CUDA build version from 11.7.1 to 12.0.0 (#2978)"
victorges Apr 1, 2024
a612f4c
Reapply "Update CUDA build version from 11.7.1 to 12.0.0 (#2978)"
victorges Apr 1, 2024
5adb9a5
Force ffmpeg reinstall
thomshutt Apr 2, 2024
ba07f69
Revert "Force ffmpeg reinstall"
thomshutt Apr 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions install_ffmpeg.sh
View file
Open in desktop
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
Loading