diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml index e8aac3330..e83adf62d 100644 --- a/.github/workflows/smoke.yml +++ b/.github/workflows/smoke.yml @@ -34,9 +34,9 @@ jobs: fail-fast: false matrix: config: - - {os: ubuntu-24.04, python: "3.12", ffmpeg: "7.1", extras: true} - - {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "7.1"} - - {os: macos-14, python: "3.9", ffmpeg: "7.1"} + - {os: ubuntu-24.04, python: "3.12", ffmpeg: "7.1.1", extras: true} + - {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "7.1.1"} + - {os: macos-14, python: "3.9", ffmpeg: "7.1.1"} env: PYAV_PYTHON: python${{ matrix.config.python }} diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 828230ac8..663cf4839 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,13 @@ We are operating with `semantic versioning `_. are merged into the "default" branch. +v14.2.1 +------- + +Fixes: + +- Uses ffmpeg 7.1.1, fixes deadlocks. + v14.2.0 ------- diff --git a/scripts/activate.sh b/scripts/activate.sh index 9dd41ba2b..ab22d79d9 100755 --- a/scripts/activate.sh +++ b/scripts/activate.sh @@ -21,7 +21,7 @@ if [[ ! "$PYAV_LIBRARY" ]]; then return 1 fi else - PYAV_LIBRARY=ffmpeg-7.1 + PYAV_LIBRARY=ffmpeg-7.1.1 echo "No \$PYAV_LIBRARY set; defaulting to $PYAV_LIBRARY" fi fi diff --git a/scripts/ffmpeg-7.1.json b/scripts/ffmpeg-7.1.json index ee386661d..2af06b2cb 100644 --- a/scripts/ffmpeg-7.1.json +++ b/scripts/ffmpeg-7.1.json @@ -1,3 +1,3 @@ { - "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/7.1-4/ffmpeg-{platform}.tar.gz" + "url": "https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/7.1.1-1/ffmpeg-{platform}.tar.gz" }