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

Add master to ffmpeg binary builds #3722

Merged
merged 1 commit into from
Jan 8, 2024
Merged

Add master to ffmpeg binary builds #3722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions .github/scripts/ffmpeg/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ if [[ "$OSTYPE" == "msys" ]]; then
fi
ffmpeg_version="${FFMPEG_VERSION:-4.1.8}"

archive="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${ffmpeg_version}.tar.gz"
if [[ "${ffmpeg_version}" == "master" ]]; then
archive="https://github.com/FFmpeg/FFmpeg/archive/master.tar.gz"
else
archive="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${ffmpeg_version}.tar.gz"
fi

build_dir=$(mktemp -d -t ffmpeg-build.XXXXXXXXXX)
cleanup() {
Expand Down Expand Up @@ -88,7 +92,7 @@ if [[ "$(uname)" == Darwin ]]; then
avformat=libavformat.59
avdevice=libavdevice.59
avfilter=libavfilter.8
elif [[ ${major_ver} == 6 ]]; then
elif [[ ${ffmpeg_version} == master || ${major_ver} == 6 ]]; then
avutil=libavutil.58
avcodec=libavcodec.60
avformat=libavformat.60
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ffmpeg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
job-name: Build
Expand All @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
with:
job-name: Build
Expand All @@ -61,7 +61,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
runner: ["macos-m1-12", "macos-12"]
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
with:
Expand All @@ -84,7 +84,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
with:
job-name: Build
Expand Down
Loading