Skip to content

Commit

Permalink
Restore tests against FFmpeg 5.x
Browse files Browse the repository at this point in the history
This reverts e884e6c.

So far we have not made any changes which justify dropping FFmpeg 5.x,
and we do not change the supported platforms in a minor release. We will
drop compatibility for FFmpeg 5.x once we switch to the new audio
channel API.
  • Loading branch information
jlaine committed May 29, 2024
1 parent e4a25fd commit f2d1f37
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ jobs:
config:
- {os: ubuntu-latest, python: "3.8", ffmpeg: "6.1", extras: true}
- {os: ubuntu-latest, python: "3.8", ffmpeg: "6.0"}
- {os: ubuntu-latest, python: "3.8", ffmpeg: "5.1"}
- {os: ubuntu-latest, python: "3.8", ffmpeg: "5.0"}
- {os: ubuntu-latest, python: pypy3.9, ffmpeg: "6.1"}
- {os: macos-12, python: "3.8", ffmpeg: "6.1"}

Expand Down Expand Up @@ -118,6 +120,8 @@ jobs:
config:
- {os: windows-latest, python: "3.8", ffmpeg: "6.1"}
- {os: windows-latest, python: "3.8", ffmpeg: "6.0"}
- {os: windows-latest, python: "3.8", ffmpeg: "5.1"}
- {os: windows-latest, python: "3.8", ffmpeg: "5.0"}

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion docs/overview/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ See the `Conda quick install <https://conda.io/docs/install/quick.html>`_ docs t
Bring your own FFmpeg
---------------------

PyAV can also be compiled against your own build of FFmpeg ((version ``6.0`` or higher). You can force installing PyAV from source by running:
PyAV can also be compiled against your own build of FFmpeg ((version ``5.0`` or higher). You can force installing PyAV from source by running:

.. code-block:: bash
Expand Down
3 changes: 3 additions & 0 deletions scripts/ffmpeg-5.0.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-{platform}.tar.gz"]
}
3 changes: 3 additions & 0 deletions scripts/ffmpeg-5.1.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.3-1/ffmpeg-{platform}.tar.gz"]
}

0 comments on commit f2d1f37

Please sign in to comment.