Skip to content

Commit b3bd879

Browse files
committed
[package] compile wheels against FFmpeg 5.1.2
We also update our test matrix to explicitly test against FFmpeg 5.1.
1 parent c107b33 commit b3bd879

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

.github/workflows/tests.yml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ jobs:
5656
fail-fast: false
5757
matrix:
5858
config:
59-
- {os: ubuntu-latest, python: 3.7, ffmpeg: "5.0", extras: true}
59+
- {os: ubuntu-latest, python: 3.7, ffmpeg: "5.1", extras: true}
60+
- {os: ubuntu-latest, python: 3.7, ffmpeg: "5.0"}
6061
- {os: ubuntu-latest, python: 3.7, ffmpeg: "4.4"}
6162
- {os: ubuntu-latest, python: 3.7, ffmpeg: "4.3"}
6263
- {os: ubuntu-latest, python: pypy3, ffmpeg: "4.4"}
@@ -146,6 +147,7 @@ jobs:
146147
fail-fast: false
147148
matrix:
148149
config:
150+
- {os: windows-latest, python: 3.7, ffmpeg: "5.1"}
149151
- {os: windows-latest, python: 3.7, ffmpeg: "5.0"}
150152
- {os: windows-latest, python: 3.7, ffmpeg: "4.4"}
151153
- {os: windows-latest, python: 3.7, ffmpeg: "4.3"}
@@ -167,7 +169,9 @@ jobs:
167169
pillow \
168170
python=${{ matrix.config.python }} \
169171
setuptools
170-
if [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then
172+
if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then
173+
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-win_amd64.tar.gz
174+
elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then
171175
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz
172176
elif [[ "${{ matrix.config.ffmpeg }}" == "4.4" ]]; then
173177
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.4.1-8/ffmpeg-win_amd64.tar.gz

docs/overview/installation.rst

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,10 @@ Since release 8.0.0 binary wheels are provided on PyPI for Linux, Mac and Window
1111
pip install av
1212
1313
14-
Currently FFmpeg 4.4.1 is used with the following features enabled for all platforms:
14+
Currently FFmpeg 5.1.2 is used with the following features enabled for all platforms:
1515

1616
- fontconfig
1717
- gmp
18-
- gnutls
1918
- libaom
2019
- libass
2120
- libbluray
@@ -38,6 +37,11 @@ Currently FFmpeg 4.4.1 is used with the following features enabled for all platf
3837
- lzma
3938
- zlib
4039

40+
The following additional features are also enabled on Linux:
41+
42+
- gnutls
43+
- libxcb
44+
4145

4246
Conda
4347
-----

scripts/fetch-vendor.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-{platform}.tar.gz"]
2+
"urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-{platform}.tar.gz"]
33
}

0 commit comments

Comments
 (0)