Commit f9a89876 authored by Alberto Villa's avatar Alberto Villa Committed by Vincent Pinon

Support a custom suffix for FFmpeg binaries

Just like MLT's --avformat-suffix, FFMPEG_SUFFIX allows for
definition of custom suffix to append to ffmpeg and ffplay binaries.
This is mostly useful for packagers willing to set a default version
for FFmpeg dependency, as users can already configure ffmpeg and
ffpaly paths via settings.

Conflicts:
	src/monitor/recmonitor.cpp

Conflicts:
	src/recmonitor.cpp
parent ab6ff62a
0.9.7
* Add support for a custom suffix for FFmpeg binaries (mostly for packagers)
0.9.6
* Fix keyframes when cutting a clip / undoing a clip cut
* Warn before overwriting .mlt stabilized file
......
......@@ -8,6 +8,8 @@
#define MLT_MIN_MINOR_VERSION @MLT_MIN_MINOR_VERSION@
#define MLT_MIN_PATCH_VERSION @MLT_MIN_PATCH_VERSION@
#define FFMPEG_SUFFIX "@FFMPEG_SUFFIX@"
#cmakedefine HAVE_MALLOC_H 1
#cmakedefine HAVE_PTHREAD_H 1
......
......@@ -13,6 +13,8 @@ macro_optional_find_package(QJSON)
option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
set(FFMPEG_SUFFIX "" CACHE STRING "FFmpeg custom suffix")
macro_optional_find_package(LibV4L2)
macro_log_feature(LIBV4L2_FOUND
"libv4l"
......
......@@ -17,7 +17,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "recmonitor.h"
#include "gentime.h"
#include "mltdevicecapture.h"
......@@ -27,6 +26,7 @@
#include "monitor.h"
#include "profilesdialog.h"
#include "widgets/videosurface.h"
#include "config-kdenlive.h"
#include <KDebug>
#include <KLocalizedString>
......@@ -270,7 +270,7 @@ void RecMonitor::slotVideoDeviceChanged(int ix)
m_stopAction->setEnabled(false);
m_playAction->setEnabled(false);
if (KdenliveSettings::ffmpegpath().isEmpty()) {
QString exepath = KStandardDirs::findExe("ffmpeg");
QString exepath = KStandardDirs::findExe(QString("ffmpeg%1").arg(FFMPEG_SUFFIX));
if (exepath.isEmpty()) {
// Check for libav version
exepath = KStandardDirs::findExe("avconv");
......
......@@ -499,8 +499,8 @@ void Wizard::slotCheckPrograms()
QTreeWidgetItem *item = new QTreeWidgetItem(m_check.programList, QStringList() << QString() << i18n("FFmpeg & ffplay"));
item->setData(1, Qt::UserRole, i18n("Required for proxy clips, transcoding and screen capture"));
item->setSizeHint(0, itemSize);
QString exepath = KStandardDirs::findExe("ffmpeg");
QString playpath = KStandardDirs::findExe("ffplay");
QString exepath = KStandardDirs::findExe(QString("ffmpeg%1").arg(FFMPEG_SUFFIX));
QString playpath = KStandardDirs::findExe(QString("ffplay%1").arg(FFMPEG_SUFFIX));
item->setIcon(0, m_okIcon);
if (exepath.isEmpty()) {
// Check for libav version
......
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