Skip to content

Commit

Permalink
Support only ffmpeg 6.0 and above
Browse files Browse the repository at this point in the history
  • Loading branch information
WyattBlue committed Apr 7, 2024
1 parent f70a35d commit e884e6c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 18 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
config:
- {os: ubuntu-latest, python: 3.9, ffmpeg: "6.1", extras: true}
- {os: ubuntu-latest, python: 3.9, ffmpeg: "6.0"}
- {os: ubuntu-latest, python: 3.9, ffmpeg: "5.1"}
- {os: ubuntu-latest, python: pypy3.9, ffmpeg: "6.1"}
- {os: macos-latest, python: 3.9, ffmpeg: "6.1"}

Expand Down Expand Up @@ -121,7 +120,6 @@ jobs:
config:
- {os: windows-latest, python: 3.9, ffmpeg: "6.1"}
- {os: windows-latest, python: 3.9, ffmpeg: "6.0"}
- {os: windows-latest, python: 3.9, ffmpeg: "5.1"}

steps:
- name: Checkout
Expand Down Expand Up @@ -214,7 +212,7 @@ jobs:
CIBW_ENVIRONMENT_MACOS: PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig LDFLAGS=-headerpad_max_install_names
CIBW_ENVIRONMENT_WINDOWS: INCLUDE=C:\\cibw\\vendor\\include LIB=C:\\cibw\\vendor\\lib PYAV_SKIP_TESTS=unicode_filename
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: delvewheel repair --add-path C:\cibw\vendor\bin -w {dest_dir} {wheel}
CIBW_SKIP: cp36-* pp36-* pp38-win* *-musllinux*
CIBW_SKIP: pp38-win* *-musllinux*
CIBW_TEST_COMMAND: mv {project}/av {project}/av.disabled && python -m unittest discover -t {project} -s tests && mv {project}/av.disabled {project}/av
CIBW_TEST_REQUIRES: numpy
# skip tests when there are no binary wheels of numpy
Expand Down
6 changes: 3 additions & 3 deletions docs/overview/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ Installation
Binary wheels
-------------

Since release 8.0.0 binary wheels are provided on PyPI for Linux, Mac and Windows linked against FFmpeg. The most straight-forward way to install PyAV is to run:
Binary wheels are provided on PyPI for Linux, MacOS, and Windows linked against FFmpeg. The most straight-forward way to install PyAV is to run:

.. code-block:: bash
pip install av
Currently FFmpeg 6.0 is used with the following features enabled for all platforms:
Currently FFmpeg 6.1.1 is used with the following features enabled for all platforms:

- fontconfig
- gmp
Expand Down 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 ``5.1`` or higher). You can force installing PyAV from source by running:
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:

.. code-block:: bash
Expand Down
10 changes: 4 additions & 6 deletions scripts/fetch-vendor.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import json
import os
import platform
import shutil
import struct
import subprocess

Expand Down Expand Up @@ -35,12 +34,11 @@ def get_platform():
args = parser.parse_args()
logging.basicConfig(level=logging.INFO)

# read config file
with open(args.config_file, "r") as fp:
with open(args.config_file) as fp:
config = json.load(fp)

# ensure destination directory exists
logging.info("Creating directory %s" % args.destination_dir)
logging.info(f"Creating directory {args.destination_dir}")
if not os.path.exists(args.destination_dir):
os.makedirs(args.destination_dir)

Expand All @@ -51,13 +49,13 @@ def get_platform():
tarball_name = tarball_url.split("/")[-1]
tarball_file = os.path.join(args.cache_dir, tarball_name)
if not os.path.exists(tarball_file):
logging.info("Downloading %s" % tarball_url)
logging.info(f"Downloading {tarball_url}")
if not os.path.exists(args.cache_dir):
os.mkdir(args.cache_dir)
subprocess.check_call(
["curl", "--location", "--output", tarball_file, "--silent", tarball_url]
)

# extract tarball
logging.info("Extracting %s" % tarball_name)
logging.info(f"Extracting {tarball_name}")
subprocess.check_call(["tar", "-C", args.destination_dir, "-xf", tarball_file])
3 changes: 0 additions & 3 deletions scripts/ffmpeg-5.0.json

This file was deleted.

3 changes: 0 additions & 3 deletions scripts/ffmpeg-5.1.json

This file was deleted.

0 comments on commit e884e6c

Please sign in to comment.