From 6a1d963237ad322a871aed9515dc282a5b496105 Mon Sep 17 00:00:00 2001 From: Louis Eveillard Date: Sat, 26 Nov 2016 01:43:18 +0100 Subject: [PATCH] adding ffmpeg-static, linking with fluent-ffmpeg --- app/bin/dodoc-media.js | 4 ++++ app/package.json | 1 + 2 files changed, 5 insertions(+) diff --git a/app/bin/dodoc-media.js b/app/bin/dodoc-media.js index 9d159fe3d..d1a83c6e0 100644 --- a/app/bin/dodoc-media.js +++ b/app/bin/dodoc-media.js @@ -4,6 +4,8 @@ var slugg = require('slugg'); var merge = require('merge'); var mm = require('marky-mark'); + +var ffmpegstatic = require('ffmpeg-static'); var ffmpeg = require('fluent-ffmpeg'); // only load sharp if not in electron (need to find how to make it work eventually) @@ -12,6 +14,8 @@ var sharp = require('sharp'); var dodoc = require('../dodoc'); var dodocAPI = require('./dodoc-api'); +ffmpeg.setFfmpegPath(ffmpegstatic.path); + var dodocMedia = (function() { const API = { diff --git a/app/package.json b/app/package.json index a1249b24e..73f3ad555 100644 --- a/app/package.json +++ b/app/package.json @@ -17,6 +17,7 @@ "download": "^3.3.0", "express": "3.1.0", "ffmpeg": "0.0.4", + "ffmpeg-static": "^2.0.0", "flags": "^0.1.3", "fluent-ffmpeg": "^2.1.0", "fs-extra": "^0.18.0",