1
0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00

Change to use system ffmpeg on linux

This commit is contained in:
Elias Steurer 2023-07-27 08:40:45 +02:00
parent daaeeff824
commit e9b1776e8b

View File

@ -65,7 +65,8 @@ void CreateImportVideo::setupFFMPEG()
m_ffprobeExecutable = QGuiApplication::applicationDirPath() + "/ffprobe" + ScreenPlayUtil::executableBinEnding(); m_ffprobeExecutable = QGuiApplication::applicationDirPath() + "/ffprobe" + ScreenPlayUtil::executableBinEnding();
m_ffmpegExecutable = QGuiApplication::applicationDirPath() + "/ffmpeg" + ScreenPlayUtil::executableBinEnding(); m_ffmpegExecutable = QGuiApplication::applicationDirPath() + "/ffmpeg" + ScreenPlayUtil::executableBinEnding();
#endif #endif
// We use system ffmpeg on linux
#ifndef Q_OS_LINUX
if (!QFileInfo::exists(m_ffprobeExecutable)) { if (!QFileInfo::exists(m_ffprobeExecutable)) {
qFatal("FFPROBE executable not found!"); qFatal("FFPROBE executable not found!");
} }
@ -73,6 +74,7 @@ void CreateImportVideo::setupFFMPEG()
if (!QFileInfo::exists(m_ffmpegExecutable)) { if (!QFileInfo::exists(m_ffmpegExecutable)) {
qFatal("FFMPEG executable not found!"); qFatal("FFMPEG executable not found!");
} }
#endif
} }
/*! /*!