Commit 5b163b9f authored by Boudewijn Rempt's avatar Boudewijn Rempt

Look first next to the krita executable for ffmpeg

Because, when running krita as a flatpak, we want our ffmpeg,
not the distribution one.

BUG:405146
parent 4ade2ae8
......@@ -455,13 +455,14 @@ QString DlgAnimationRenderer::findFFMpeg(const QString &customLocation)
proposedPaths << customLocation + QDir::separator() + "ffmpeg";
}
proposedPaths << KoResourcePaths::getApplicationRoot() +
QDir::separator() + "bin" + QDir::separator() + "ffmpeg";
#ifndef Q_OS_WIN
proposedPaths << QDir::homePath() + "/bin/ffmpeg";
proposedPaths << "/usr/bin/ffmpeg";
proposedPaths << "/usr/local/bin/ffmpeg";
#endif
proposedPaths << KoResourcePaths::getApplicationRoot() +
QDir::separator() + "bin" + QDir::separator() + "ffmpeg";
Q_FOREACH (QString path, proposedPaths) {
if (path.isEmpty()) continue;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment