Merge pull request #209 from l-atelier-des-chercheurs/embedding-stati…

…c-ffmpeg-build Embedding static ffmpeg build
l-atelier-des-chercheurs · Nov 26, 2016 · 96ed063 · 96ed063
2 parents 7d2c313 + 8e963a6
commit 96ed063
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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",