From cdc49c6b4b3b75844d66d645e09de4be294881da Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Wed, 12 Oct 2016 14:29:10 +0200
Subject: [PATCH] Allow mp4 uploads, convert to WebM
---
app/models/media_attachment.rb | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb
index 678968ce87..93c915b018 100644
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@@ -1,6 +1,6 @@
class MediaAttachment < ApplicationRecord
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze
- VIDEO_MIME_TYPES = ['video/webm'].freeze
+ VIDEO_MIME_TYPES = ['video/webm', 'video/mp4'].freeze
belongs_to :account, inverse_of: :media_attachments
belongs_to :status, inverse_of: :media_attachments
@@ -43,14 +43,19 @@ private
}
else
{
- small: {
- convert_options: {
- output: {
- vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease'
- }
+ original: {
+ convert_options: {},
+ format: 'webm'
},
- format: 'png',
- time: 1
+
+ small: {
+ convert_options: {
+ output: {
+ vf: 'scale="min(510\, iw):min(680\, ih)":force_original_aspect_ratio=decrease'
+ }
+ },
+ format: 'png',
+ time: 1
}
}
end