Skip to content

Commit

Permalink
Explicitly drop support for FFmpeg < 5.0
Browse files Browse the repository at this point in the history
Our code now depends on FFmpeg 5.0 or better, so update the test matrix.
  • Loading branch information
jlaine committed Oct 29, 2023
1 parent 1d41e37 commit 4e5d7b7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 19 deletions.
28 changes: 10 additions & 18 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,8 @@ jobs:
config:
- {os: ubuntu-latest, python: 3.8, ffmpeg: "5.1", extras: true}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "5.0"}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "4.4"}
- {os: ubuntu-latest, python: 3.8, ffmpeg: "4.3"}
- {os: ubuntu-latest, python: pypy3.9, ffmpeg: "4.4"}
- {os: macos-latest, python: 3.8, ffmpeg: "4.4"}
- {os: ubuntu-latest, python: pypy3.9, ffmpeg: "5.0"}
- {os: macos-latest, python: 3.8, ffmpeg: "5.0"}

env:
PYAV_PYTHON: python${{ matrix.config.python }}
Expand Down Expand Up @@ -145,8 +143,6 @@ jobs:
config:
- {os: windows-latest, python: 3.8, ffmpeg: "5.1"}
- {os: windows-latest, python: 3.8, ffmpeg: "5.0"}
- {os: windows-latest, python: 3.8, ffmpeg: "4.4"}
- {os: windows-latest, python: 3.8, ffmpeg: "4.3"}

steps:
- name: Checkout
Expand All @@ -164,24 +160,20 @@ jobs:
pillow \
python=${{ matrix.config.python }} \
setuptools
if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-win_amd64.tar.gz
elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz
elif [[ "${{ matrix.config.ffmpeg }}" == "4.4" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/4.4.1-8/ffmpeg-win_amd64.tar.gz
else
conda install -q -n pyav ffmpeg=${{ matrix.config.ffmpeg }}
fi
if [[ "${{ matrix.config.ffmpeg }}" == "5.1" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.1.2-1/ffmpeg-win_amd64.tar.gz
elif [[ "${{ matrix.config.ffmpeg }}" == "5.0" ]]; then
curl -L -o ffmpeg.tar.gz https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/5.0.1-1/ffmpeg-win_amd64.tar.gz
else
exit 1
fi
- name: Build
shell: bash
run: |
. $CONDA/etc/profile.d/conda.sh
conda activate pyav
if [[ "${{ matrix.config.ffmpeg }}" != "4.3" ]]; then
tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/
fi
tar -xf ffmpeg.tar.gz -C $CONDA_PREFIX/Library/
python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX/Library
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion docs/overview/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,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 ``4.3`` 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

0 comments on commit 4e5d7b7

Please sign in to comment.