luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-19 13:23:13 +00:00
Code Issues Projects Releases Wiki Activity

Allow mp4 uploads, convert to WebM

Browse source
This commit is contained in:
Eugen Rochko 2016-10-12 14:29:10 +02:00
parent 5e511acb82
commit cdc49c6b4b
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/media_attachment.rb
View file

@ -1,6 +1,6 @@
class MediaAttachment < ApplicationRecord class MediaAttachment < ApplicationRecord
IMAGE_MIME_TYPES = ['image/jpeg', 'image/png', 'image/gif'].freeze 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 :account, inverse_of: :media_attachments
belongs_to :status, inverse_of: :media_attachments belongs_to :status, inverse_of: :media_attachments
@ -43,6 +43,11 @@ private
} }
else else
{ {
original: {
convert_options: {},
format: 'webm'
},
small: { small: {
convert_options: { convert_options: {
output: { output: {