Skip to content

Commit bc9ae5b

Browse files
committed
Use ffmpeg 7.1.1
1 parent 4e01ca7 commit bc9ae5b

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

.github/workflows/smoke.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ jobs:
3434
fail-fast: false
3535
matrix:
3636
config:
37-
- {os: ubuntu-24.04, python: "3.12", ffmpeg: "7.1", extras: true}
38-
- {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "7.1"}
39-
- {os: macos-14, python: "3.9", ffmpeg: "7.1"}
37+
- {os: ubuntu-24.04, python: "3.12", ffmpeg: "7.1.1", extras: true}
38+
- {os: ubuntu-24.04, python: "pypy3.10", ffmpeg: "7.1.1"}
39+
- {os: macos-14, python: "3.9", ffmpeg: "7.1.1"}
4040

4141
env:
4242
PYAV_PYTHON: python${{ matrix.config.python }}

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,13 @@ We are operating with `semantic versioning <https://semver.org>`_.
1717
are merged into the "default" branch.
1818

1919

20+
v14.2.1
21+
-------
22+
23+
Fixes:
24+
25+
- Uses ffmpeg 7.1.1, fixes deadlocks.
26+
2027
v14.2.0
2128
-------
2229

scripts/activate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ if [[ ! "$PYAV_LIBRARY" ]]; then
2121
return 1
2222
fi
2323
else
24-
PYAV_LIBRARY=ffmpeg-7.1
24+
PYAV_LIBRARY=ffmpeg-7.1.1
2525
echo "No \$PYAV_LIBRARY set; defaulting to $PYAV_LIBRARY"
2626
fi
2727
fi

scripts/ffmpeg-7.1.json

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

0 commit comments

Comments
 (0)