Skip to content

Unbreak FFmpeg compatibility

Amy spark requested to merge lsegovia/krita:work/amyspark/unbreak-emmet-ffmpeg into master

Hi all!

This MR unbreaks the FFmpeg importer and exporter after !1599 (merged) took place. Some of the bits are shippable without review, but there are two I'd like some external verification for:

  • libaom cannot be built as a shared library. Not only it'll race condition with aom_static because both are named the same, aom (CMake sets the same suffix for export and static libraries under MSVC), the shared version does not export the symbols for AV1 correctly.
  • zlib has a conflict with macro definitions used by FFmpeg, they don't cause any issues with Unix-based compilers unless your system doesn't have unistd.h installed. This was reported here: https://github.com/madler/zlib/issues/787

The others are:

  • update to aom 3.6 to fix some optimization bugs
  • fixed our FFmpeg copy lacking the APNG muxer, which is needed when importing a video animation
  • fixed our FFmpeg copy lacking FFprobe, which can be used when importing a video animation (otherwise it falls back to FFmpeg)
  • fixed a missed logic check for when FFmpeg isn't available yet the dialog allows to edit all codec options
  • added fallback logic to find our own installed FFmpeg or a system copy. This is needed on first install, when the ffmpegLocation preference isn't yet set.

Test Plan

Build deps and Krita,

Formalities Checklist

  • I confirmed this builds.
  • I confirmed Krita ran and the relevant functions work.
  • I tested the relevant unit tests and can confirm they are not broken. (If not possible, don't hesitate to ask for help!)
  • I made sure my commits build individually and have good descriptions as per KDE guidelines.
  • I made sure my code conforms to the standards set in the HACKING file.
  • I can confirm the code is licensed and attributed appropriately, and that unattributed code is mine, as per KDE Licensing Policy.

Reminder: the reviewer is responsible for merging the patch, this is to ensure at the least two people can build the patch. In case a patch breaks the build, both the author and the reviewer should be contacted to fix the build. If this is not possible, the commits shall be reverted, and a notification with the reasoning and any relevant logs shall be sent to the mailing list, kimageshop@kde.org.

Merge request reports