File tree Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Expand file tree Collapse file tree 2 files changed +10
-6
lines changed Original file line number Diff line number Diff line change @@ -22,7 +22,11 @@ if [[ "$OSTYPE" == "msys" ]]; then
22
22
fi
23
23
ffmpeg_version=" ${FFMPEG_VERSION:- 4.1.8} "
24
24
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
26
30
27
31
build_dir=$( mktemp -d -t ffmpeg-build.XXXXXXXXXX)
28
32
cleanup () {
@@ -88,7 +92,7 @@ if [[ "$(uname)" == Darwin ]]; then
88
92
avformat=libavformat.59
89
93
avdevice=libavdevice.59
90
94
avfilter=libavfilter.8
91
- elif [[ ${major_ver} == 6 ]]; then
95
+ elif [[ ${ffmpeg_version} == master || ${ major_ver} == 6 ]]; then
92
96
avutil=libavutil.58
93
97
avcodec=libavcodec.60
94
98
avformat=libavformat.60
Original file line number Diff line number Diff line change 17
17
strategy :
18
18
fail-fast : false
19
19
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" ]
21
21
uses : pytorch/test-infra/.github/workflows/linux_job.yml@main
22
22
with :
23
23
job-name : Build
38
38
strategy :
39
39
fail-fast : false
40
40
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" ]
42
42
uses : pytorch/test-infra/.github/workflows/linux_job.yml@main
43
43
with :
44
44
job-name : Build
61
61
strategy :
62
62
fail-fast : false
63
63
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" ]
65
65
runner : ["macos-m1-12", "macos-12"]
66
66
uses : pytorch/test-infra/.github/workflows/macos_job.yml@main
67
67
with :
84
84
strategy :
85
85
fail-fast : false
86
86
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" ]
88
88
uses : pytorch/test-infra/.github/workflows/windows_job.yml@main
89
89
with :
90
90
job-name : Build
You can’t perform that action at this time.
0 commit comments