Skip to content

Commit 743f512

Browse files
committed
Add master to ffmpeg binary builds
1 parent 639a4e9 commit 743f512

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

.github/scripts/ffmpeg/build.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ if [[ "$OSTYPE" == "msys" ]]; then
2222
fi
2323
ffmpeg_version="${FFMPEG_VERSION:-4.1.8}"
2424

25-
archive="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${ffmpeg_version}.tar.gz"
25+
if [[ "${ffmpeg_version}" == "master" ]]; then
26+
archive="https://github.com/FFmpeg/FFmpeg/archive/master.tar.gz"
27+
else
28+
archive="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/n${ffmpeg_version}.tar.gz"
29+
fi
2630

2731
build_dir=$(mktemp -d -t ffmpeg-build.XXXXXXXXXX)
2832
cleanup() {
@@ -88,7 +92,7 @@ if [[ "$(uname)" == Darwin ]]; then
8892
avformat=libavformat.59
8993
avdevice=libavdevice.59
9094
avfilter=libavfilter.8
91-
elif [[ ${major_ver} == 6 ]]; then
95+
elif [[ ${ffmpeg_version} == master || ${major_ver} == 6 ]]; then
9296
avutil=libavutil.58
9397
avcodec=libavcodec.60
9498
avformat=libavformat.60

.github/workflows/ffmpeg.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
20+
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
2121
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
2222
with:
2323
job-name: Build
@@ -38,7 +38,7 @@ jobs:
3838
strategy:
3939
fail-fast: false
4040
matrix:
41-
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
41+
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
4242
uses: pytorch/test-infra/.github/workflows/linux_job.yml@main
4343
with:
4444
job-name: Build
@@ -61,7 +61,7 @@ jobs:
6161
strategy:
6262
fail-fast: false
6363
matrix:
64-
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
64+
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
6565
runner: ["macos-m1-12", "macos-12"]
6666
uses: pytorch/test-infra/.github/workflows/macos_job.yml@main
6767
with:
@@ -84,7 +84,7 @@ jobs:
8484
strategy:
8585
fail-fast: false
8686
matrix:
87-
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1"]
87+
ffmpeg_version: ["4.4.4", "5.1.4", "6.1.1", "master"]
8888
uses: pytorch/test-infra/.github/workflows/windows_job.yml@main
8989
with:
9090
job-name: Build

0 commit comments

Comments
 (0)