Skip to content

Update FFmpeg to 6.0

amyspark requested to merge amyspark/ffmpeg:amyspark/meson-6.0 into meson-6.0

Hi all,

This PR updates the FFmpeg version to 6.0. The branch comprises three merge points:

  • 5.0.3
  • 5.1.3
  • 6.0

In all cases I split the merge itself and the changes to the Meson toolchain. In the 5.1.3 and 6.0 cases, additional fixes for new logic were needed, which are in separate commits. These include:

  • fixing a race condition in the exports parser that caused the macOS 5.x build to get bogus output: 574ef645
  • enabling a separate flag to disable Nasm (useful for debugging MSVC 2019 builds): 59234e90
  • working around the longstanding MSVC 2019 deadlock when linking Nasm objects/PDBs: 3c6905ef
  • incorporating additional logging and changing CI runners for the i386 builds: f4504b05, 84369608

Let me know what you think. @tpm we would need a 6.0 branch, for the time being I filed it against meson-4.4.

Fixes #27 (closed)

Merge request reports