Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add ffmpeg initializer #8855

Merged

Conversation

ghost
Copy link

@ghost ghost commented Oct 2, 2018

fixes #8648

this might be useful if multiple versions of ffmpeg are installed, or if additional sandboxing should be applied

@@ -0,0 +1,3 @@
if defined? ENV['FFMPEG_BINARY']
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if ENV['FFMPEG_BINARY'].present?

@Gargron Gargron merged commit b2a57a5 into mastodon:master Oct 9, 2018
@ghost ghost deleted the serenitylabs/patch/ffmpeg branch October 9, 2018 11:25
@ghost ghost restored the serenitylabs/patch/ffmpeg branch October 9, 2018 11:25
@ghost ghost deleted the serenitylabs/patch/ffmpeg branch October 9, 2018 11:25
@ghost ghost restored the serenitylabs/patch/ffmpeg branch October 9, 2018 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

sandbox ffmpeg by default
1 participant