Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
Torchaudio
Commits
e3efbc2d
Unverified
Commit
e3efbc2d
authored
Jan 09, 2024
by
moto
Committed by
GitHub
Jan 09, 2024
Browse files
Add master to ffmpeg binary builds (#3722)
parent
639a4e95
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
.github/scripts/ffmpeg/build.sh
.github/scripts/ffmpeg/build.sh
+6
-2
.github/workflows/ffmpeg.yml
.github/workflows/ffmpeg.yml
+4
-4
No files found.
.github/scripts/ffmpeg/build.sh
View file @
e3efbc2d
...
@@ -22,7 +22,11 @@ if [[ "$OSTYPE" == "msys" ]]; then
...
@@ -22,7 +22,11 @@ if [[ "$OSTYPE" == "msys" ]]; then
fi
fi
ffmpeg_version
=
"
${
FFMPEG_VERSION
:-
4
.1.8
}
"
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
)
build_dir
=
$(
mktemp
-d
-t
ffmpeg-build.XXXXXXXXXX
)
cleanup
()
{
cleanup
()
{
...
@@ -88,7 +92,7 @@ if [[ "$(uname)" == Darwin ]]; then
...
@@ -88,7 +92,7 @@ if [[ "$(uname)" == Darwin ]]; then
avformat
=
libavformat.59
avformat
=
libavformat.59
avdevice
=
libavdevice.59
avdevice
=
libavdevice.59
avfilter
=
libavfilter.8
avfilter
=
libavfilter.8
elif
[[
${
major_ver
}
==
6
]]
;
then
elif
[[
${
ffmpeg_version
}
==
master
||
${
major_ver
}
==
6
]]
;
then
avutil
=
libavutil.58
avutil
=
libavutil.58
avcodec
=
libavcodec.60
avcodec
=
libavcodec.60
avformat
=
libavformat.60
avformat
=
libavformat.60
...
...
.github/workflows/ffmpeg.yml
View file @
e3efbc2d
...
@@ -17,7 +17,7 @@ jobs:
...
@@ -17,7 +17,7 @@ jobs:
strategy
:
strategy
:
fail-fast
:
false
fail-fast
:
false
matrix
:
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
uses
:
pytorch/test-infra/.github/workflows/linux_job.yml@main
with
:
with
:
job-name
:
Build
job-name
:
Build
...
@@ -38,7 +38,7 @@ jobs:
...
@@ -38,7 +38,7 @@ jobs:
strategy
:
strategy
:
fail-fast
:
false
fail-fast
:
false
matrix
:
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
uses
:
pytorch/test-infra/.github/workflows/linux_job.yml@main
with
:
with
:
job-name
:
Build
job-name
:
Build
...
@@ -61,7 +61,7 @@ jobs:
...
@@ -61,7 +61,7 @@ jobs:
strategy
:
strategy
:
fail-fast
:
false
fail-fast
:
false
matrix
:
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"
]
runner
:
[
"
macos-m1-12"
,
"
macos-12"
]
uses
:
pytorch/test-infra/.github/workflows/macos_job.yml@main
uses
:
pytorch/test-infra/.github/workflows/macos_job.yml@main
with
:
with
:
...
@@ -84,7 +84,7 @@ jobs:
...
@@ -84,7 +84,7 @@ jobs:
strategy
:
strategy
:
fail-fast
:
false
fail-fast
:
false
matrix
:
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
uses
:
pytorch/test-infra/.github/workflows/windows_job.yml@main
with
:
with
:
job-name
:
Build
job-name
:
Build
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment