Write our own comptime to deal with ffmpeg 6

.github/workflows/smoke.yml

@@ -142,6 +142,7 @@ jobs:
         . $CONDA/etc/profile.d/conda.sh
         conda activate pyav
         python scripts\\fetch-vendor.py --config-file scripts\\ffmpeg-${{ matrix.config.ffmpeg }}.json $CONDA_PREFIX\\Library
+        python scripts\\comptime.py  ${{ matrix.config.ffmpeg }}
         python setup.py build_ext --inplace --ffmpeg-dir=$CONDA_PREFIX\\Library
 
     - name: Test

av/audio/frame.pyx

@@ -47,7 +47,7 @@ cdef class AudioFrame(Frame):
         self.ptr.nb_samples = nb_samples
         self.ptr.format = <int>format
         self.ptr.ch_layout = layout
-        self.ptr.channels = layout.nb_channels
+        # [FFMPEG6] self.ptr.channels = layout.nb_channels  # ffmpeg 6 only
 
         # Sometimes this is called twice. Oh well.
         self._init_user_attributes()

include/libavcodec/avcodec.pxd

@@ -378,7 +378,8 @@ cdef extern from "libavcodec/avcodec.h" nogil:
 
         int nb_samples  # Audio samples
         int sample_rate  # Audio Sample rate
-        int channels
+        # [FFMPEG6] int channels
+
         AVChannelLayout ch_layout
 
         int64_t pts

scripts/build

@@ -21,4 +21,5 @@ which ffmpeg || exit 2
 ffmpeg -version || exit 3
 echo
 
+"$PYAV_PYTHON" scripts/comptime.py
 "$PYAV_PYTHON" setup.py config build_ext --inplace || exit 1

scripts/comptime.py

@@ -0,0 +1,28 @@
+import os
+import sys
+
+def replace_in_file(file_path):
+    try:
+        with open(file_path, "r", encoding="utf-8") as file:
+            content = file.read()
+
+        modified_content = content.replace("# [FFMPEG6] ", "")
+
+        with open(file_path, "w") as file:
+            file.write(modified_content)
+    except UnicodeDecodeError:
+        pass
+
+
+def process_directory(directory):
+    for root, dirs, files in os.walk(directory):
+        for file in files:
+            file_path = os.path.join(root, file)
+            replace_in_file(file_path)
+
+if sys.platform == "win32" and sys.argv[1].startswith("6"):
+    process_directory("av")
+    process_directory("include")
+elif os.environ.get("PYAV_LIBRARY").startswith("ffmpeg-6"):
+    process_directory("av")
+    process_directory("include")