Merge branch 'main' into glitch-soc/merge-upstream

Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
2022-11-28 11:33:34 +01:00
parent 6517b7b9f0 cec1e902e0
commit a2e7997592
246 changed files with 17637 additions and 6738 deletions
--- a/app/models/media_attachment.rb
+++ b/app/models/media_attachment.rb
@ -104,6 +104,7 @@ class MediaAttachment < ApplicationRecord
        'c:v' => 'h264',
        'maxrate' => '1300K',
        'bufsize' => '1300K',
+        'b:v' => '1300K',
        'frames:v' => 60 * 60 * 3,
        'crf' => 18,
        'map_metadata' => '-1',