[chronojump] ffmpeg and ffplay included on mac installation (untested)
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] ffmpeg and ffplay included on mac installation (untested)
- Date: Thu, 4 Apr 2019 12:59:31 +0000 (UTC)
commit ca96f100cf12aef3a8ead36c2b27ddee2fc0b7f9
Author: Xavier de Blas <xaviblas gmail com>
Date: Thu Apr 4 14:58:06 2019 +0200
ffmpeg and ffplay included on mac installation (untested)
Makefile.am | 1 +
ffmpegBinariesMac/Makefile.am | 3 +++
ffmpegBinariesMac/ffmpeg | Bin 0 -> 68060444 bytes
ffmpegBinariesMac/ffplay | Bin 0 -> 70371280 bytes
src/webcamFfmpeg.cs | 1 -
5 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/Makefile.am b/Makefile.am
index 447fe2b4..277b8c91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ ChangeLog:
dist: ChangeLog
if OSTYPE_OS_X
+SUBDIRS += ffmpegBinariesMac
export CHRONOJUMP_VERSION = @PACKAGE_VERSION@
export CHRONOJUMP_COMMIT = origin/@GIT_BRANCH@
CERBERO_COMMAND = /Users/chronojump/cerbero/cerbero-uninstalled -c
/Users/chronojump/cerbero/cerbero-extras/chronojump.cbc
diff --git a/ffmpegBinariesMac/Makefile.am b/ffmpegBinariesMac/Makefile.am
new file mode 100644
index 00000000..e520a830
--- /dev/null
+++ b/ffmpegBinariesMac/Makefile.am
@@ -0,0 +1,3 @@
+TARGET = all
+
+bin_SCRIPTS = ffmpeg ffplay
diff --git a/ffmpegBinariesMac/ffmpeg b/ffmpegBinariesMac/ffmpeg
new file mode 100755
index 00000000..323d0038
Binary files /dev/null and b/ffmpegBinariesMac/ffmpeg differ
diff --git a/ffmpegBinariesMac/ffplay b/ffmpegBinariesMac/ffplay
new file mode 100755
index 00000000..f0b21368
Binary files /dev/null and b/ffmpegBinariesMac/ffplay differ
diff --git a/src/webcamFfmpeg.cs b/src/webcamFfmpeg.cs
index 570ebed3..c14e86ca 100644
--- a/src/webcamFfmpeg.cs
+++ b/src/webcamFfmpeg.cs
@@ -25,7 +25,6 @@ using System.IO;
using System.Text.RegularExpressions; //Regex
//note the stdout and stderr redirection to false is to fix problems with windows
-//on OSX we have copied it with sudo to /usr/local/bin it will be better if we put the binary of ffmpeg and
ffplay on binaries on Chronojump installation
public class WebcamFfmpeg : Webcam
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]