Merge branch 'master' into glitch-soc/merge-upstream

2018-10-09 12:12:03 +02:00
parent 4134a10549 b2a57a5d6f
commit 122ac9cd1d
5 changed files with 16 additions and 1 deletions
@@ -0,0 +1,3 @@
+if ENV['FFMPEG_BINARY'].present?
+    FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY']
+end