diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2020-08-30 01:54:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-08-30 01:54:30 +0200 |
commit | bf477cee9f31036ebf3d164ddec1cebef5375513 (patch) | |
tree | a91a277ad6a442379197e6adb58068b7cb45f251 /app | |
parent | 8630afb468baf1ae654116784c3a636213e98bae (diff) |
Fix videos with near-60 fps being rejected (#14684)
Fix #14668
Diffstat (limited to 'app')
-rw-r--r-- | app/models/media_attachment.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 3d93ec75b..663bb0896 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -338,7 +338,7 @@ class MediaAttachment < ApplicationRecord raise Mastodon::StreamValidationError, 'Video has no video stream' if movie.width.nil? || movie.frame_rate.nil? raise Mastodon::DimensionsValidationError, "#{movie.width}x#{movie.height} videos are not supported" if movie.width * movie.height > MAX_VIDEO_MATRIX_LIMIT - raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.to_i}fps videos are not supported" if movie.frame_rate > MAX_VIDEO_FRAME_RATE + raise Mastodon::DimensionsValidationError, "#{movie.frame_rate.floor}fps videos are not supported" if movie.frame_rate.floor > MAX_VIDEO_FRAME_RATE end def set_meta |