diff options
| author | ThibG <thib@sitedethib.com> | 2018-10-09 13:23:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-09 13:23:01 +0200 |
| commit | 641d056e0f21cdbef26a6b8ee9baced7d5da58c5 (patch) | |
| tree | 63aac8a75d3e573fd3b56eb8f79edec818e03082 /config/initializers | |
| parent | 4134a10549a833ad5ab18b3c579304919d594ce1 (diff) | |
| parent | 122ac9cd1deb66f02220cadcc50422ffa645e122 (diff) | |
Merge pull request #774 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/ffmpeg.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/ffmpeg.rb b/config/initializers/ffmpeg.rb new file mode 100644 index 000000000..4c0bf779d --- /dev/null +++ b/config/initializers/ffmpeg.rb @@ -0,0 +1,3 @@ +if ENV['FFMPEG_BINARY'].present? + FFMPEG.ffmpeg_binary = ENV['FFMPEG_BINARY'] +end |