pyrox.dev
1diff --git a/src/docks/encodedock.cpp b/src/docks/encodedock.cpp
2index bba23d7..2d74f8c 100755
3--- a/src/docks/encodedock.cpp
4+++ b/src/docks/encodedock.cpp
5@@ -2570,7 +2570,7 @@ bool EncodeDock::detectHardwareEncoders()
6 {
7 MAIN.showStatusMessage(tr("Detecting hardware encoders..."));
8 QStringList hwlist;
9- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg");
10+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg");
11 for (const QString &codec : codecs()) {
12 LOG_INFO() << "checking for" << codec;
13 QProcess proc;
14@@ -2617,7 +2617,7 @@ bool EncodeDock::detectHardwareEncoders()
15 QString &EncodeDock::defaultFormatExtension()
16 {
17 auto format = ui->formatCombo->currentText();
18- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg");
19+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg");
20 QProcess proc;
21 QStringList args;
22 args << "-hide_banner" << "-h" << format.prepend("muxer=");
23diff --git a/src/jobs/ffmpegjob.cpp b/src/jobs/ffmpegjob.cpp
24index fe390d3..39b847a 100644
25--- a/src/jobs/ffmpegjob.cpp
26+++ b/src/jobs/ffmpegjob.cpp
27@@ -55,7 +55,7 @@ FfmpegJob::~FfmpegJob()
28 void FfmpegJob::start()
29 {
30 QString shotcutPath = qApp->applicationDirPath();
31- QFileInfo ffmpegPath(shotcutPath, "ffmpeg");
32+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg");
33 setReadChannel(QProcess::StandardError);
34 LOG_DEBUG() << ffmpegPath.absoluteFilePath() + " " + m_args.join(' ');
35 AbstractJob::start(ffmpegPath.absoluteFilePath(), m_args);
36diff --git a/src/jobs/meltjob.cpp b/src/jobs/meltjob.cpp
37index 019f693..15b8969 100644
38--- a/src/jobs/meltjob.cpp
39+++ b/src/jobs/meltjob.cpp
40@@ -115,9 +115,9 @@ void MeltJob::start()
41 }
42 QString shotcutPath = qApp->applicationDirPath();
43 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
44- QFileInfo meltPath(shotcutPath, "melt-7");
45+ QFileInfo meltPath("@mlt@/bin/melt");
46 #else
47- QFileInfo meltPath(shotcutPath, "melt");
48+ QFileInfo meltPath("@mlt@/bin/melt");
49 #endif
50 setReadChannel(QProcess::StandardError);
51 QStringList args;
52diff --git a/src/mltcontroller.cpp b/src/mltcontroller.cpp
53index 3d3b070..f57cfd1 100644
54--- a/src/mltcontroller.cpp
55+++ b/src/mltcontroller.cpp
56@@ -1668,9 +1668,9 @@ int Controller::checkFile(const QString &path)
57 || path.endsWith(".aep")) {
58 QString shotcutPath = qApp->applicationDirPath();
59 #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
60- QFileInfo meltPath(shotcutPath, "melt-7");
61+ QFileInfo meltPath("@mlt@/bin/melt");
62 #else
63- QFileInfo meltPath(shotcutPath, "melt");
64+ QFileInfo meltPath("@mlt@/bin/melt");
65 #endif
66 QStringList args;
67 args << "-quiet" << "-consumer" << "null" << "real_time=0" << "out=0" << "terminate_on_pause=1" <<
68diff --git a/src/widgets/directshowvideowidget.cpp b/src/widgets/directshowvideowidget.cpp
69index a636a22..7a7b068 100644
70--- a/src/widgets/directshowvideowidget.cpp
71+++ b/src/widgets/directshowvideowidget.cpp
72@@ -35,7 +35,7 @@ DirectShowVideoWidget::DirectShowVideoWidget(QWidget *parent) :
73 ui->setupUi(this);
74 Util::setColorsToHighlight(ui->label);
75 #ifdef Q_OS_WIN
76- QFileInfo ffmpegPath(qApp->applicationDirPath(), "ffmpeg");
77+ QFileInfo ffmpegPath("@ffmpeg@/bin/ffmpeg");
78 QProcess proc;
79 QStringList args;
80 args << "-hide_banner" << "-list_devices" << "true" << "-f" << "dshow" << "-i" << "dummy";