Commit ca96f100 authored by Xavier de Blas's avatar Xavier de Blas

ffmpeg and ffplay included on mac installation (untested)

parent 64134586
......@@ -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
......
TARGET = all
bin_SCRIPTS = ffmpeg ffplay
......@@ -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
{
......
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