Upgrade to ffmpeg 6.1

PyAV-Org · Dec 27, 2023 · 5bec1be · 5bec1be
1 parent bf87dc2
commit 5bec1be
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 24 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -38,11 +38,11 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: ubuntu-latest, python: 3.8, ffmpeg: "6.0", extras: true}
+          - {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: "5.0"}
-          - {os: macos-latest,  python: 3.8, ffmpeg: "5.0"}
+          - {os: ubuntu-latest, python: pypy3.9, ffmpeg: "6.1"}
+          - {os: macos-latest,  python: 3.8, ffmpeg: "6.1"}
 
     env:
       PYAV_PYTHON: python${{ matrix.config.python }}
@@ -119,9 +119,8 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: windows-latest, python: 3.8, ffmpeg: "6.0"}
+          - {os: windows-latest, python: 3.8, ffmpeg: "6.1"}
           - {os: windows-latest, python: 3.8, ffmpeg: "5.1"}
-          - {os: windows-latest, python: 3.8, ffmpeg: "5.0"}
 
     steps:
     - name: Checkout
@@ -165,7 +164,7 @@ jobs:
       - name: Build source package
         run: |
           pip install cython
-          python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.0.json /tmp/vendor
+          python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
           PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig python setup.py sdist
       - name: Upload source package
         uses: actions/upload-artifact@v3
@@ -208,8 +207,8 @@ jobs:
         env:
           CIBW_ARCHS: ${{ matrix.arch }}
           CIBW_BEFORE_ALL_LINUX: yum install -y alsa-lib libxcb
-          CIBW_BEFORE_BUILD: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.0.json /tmp/vendor
-          CIBW_BEFORE_BUILD_WINDOWS: python scripts\fetch-vendor.py --config-file scripts\ffmpeg-6.0.json C:\cibw\vendor
+          CIBW_BEFORE_BUILD: python scripts/fetch-vendor.py --config-file scripts/ffmpeg-6.1.json /tmp/vendor
+          CIBW_BEFORE_BUILD_WINDOWS: python scripts\fetch-vendor.py --config-file scripts\ffmpeg-6.1.json C:\cibw\vendor
           CIBW_ENVIRONMENT_LINUX: LD_LIBRARY_PATH=/tmp/vendor/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=/tmp/vendor/lib/pkgconfig
           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

diff --git a/scripts/ffmpeg-6.1.json b/scripts/ffmpeg-6.1.json
@@ -0,0 +1,3 @@
+{
+    "urls": ["https://github.com/PyAV-Org/pyav-ffmpeg/releases/download/6.1.0-1/ffmpeg-{platform}.tar.gz"]
+}
diff --git a/tests/test_file_probing.py b/tests/test_file_probing.py
@@ -320,20 +320,6 @@ def test_stream_probing(self):
         self.assertIn(stream.coded_width, (720, 0))
         self.assertIn(stream.coded_height, (576, 0))
 
-        # Deprecated properties.
-        with warnings.catch_warnings(record=True) as captured:
-            self.assertIsNone(stream.framerate)
-            self.assertEqual(
-                captured[0].message.args[0],
-                "VideoStream.framerate is deprecated as it is not always set; please use VideoStream.average_rate.",
-            )
-        with warnings.catch_warnings(record=True) as captured:
-            self.assertIsNone(stream.rate)
-            self.assertEqual(
-                captured[0].message.args[0],
-                "VideoStream.rate is deprecated as it is not always set; please use VideoStream.average_rate.",
-            )
-
 
 class TestVideoProbeCorrupt(TestCase):
     def setUp(self):
@@ -362,7 +348,6 @@ def test_stream_probing(self):
         self.assertTrue(str(stream).startswith("<av.VideoStream #0 h264, None 0x0 at "))
 
         # actual stream properties
-        self.assertEqual(stream.average_rate, None)
         self.assertEqual(stream.duration, None)
         self.assertEqual(stream.frames, 0)
         self.assertEqual(stream.id, 0)