diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2021-05-05 19:44:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-05 19:44:01 +0200 |
| commit | 036556d3509fac5fa487a0d5ff3cf95767e8d84f (patch) | |
| tree | f3435a4f1a5cbb999fde3118e9d17e62a889a59d /config | |
| parent | dfa002932d660656792a78887264dd00820f2dda (diff) | |
Fix media processing getting stuck on too much stdin/stderr (#16136)
* Fix media processing getting stuck on too much stdin/stderr See thoughtbot/terrapin#5 * Remove dependency on paperclip-av-transcoder gem * Remove dependency on streamio-ffmpeg gem * Disable stdin on ffmpeg process
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb index 9aa1594ce..37a996224 100644 --- a/config/application.rb +++ b/config/application.rb @@ -13,12 +13,12 @@ require_relative '../lib/redis/namespace_extensions' require_relative '../lib/paperclip/url_generator_extensions' require_relative '../lib/paperclip/attachment_extensions' require_relative '../lib/paperclip/media_type_spoof_detector_extensions' -require_relative '../lib/paperclip/transcoder_extensions' require_relative '../lib/paperclip/lazy_thumbnail' require_relative '../lib/paperclip/gif_transcoder' -require_relative '../lib/paperclip/video_transcoder' +require_relative '../lib/paperclip/transcoder' require_relative '../lib/paperclip/type_corrector' require_relative '../lib/paperclip/response_with_limit_adapter' +require_relative '../lib/terrapin/multi_pipe_extensions' require_relative '../lib/mastodon/snowflake' require_relative '../lib/mastodon/version' require_relative '../lib/devise/two_factor_ldap_authenticatable' |