diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-28 11:33:34 +0100 |
| commit | a2e7997592dd86baa7595c41eed274be4c200d07 (patch) | |
| tree | b4c21af8bdf541d8156beb29e9f53766bd1fbadd /app/models/media_attachment.rb | |
| parent | 6517b7b9f02f8590a8f9c5aa04e3ef9efeb4e757 (diff) | |
| parent | cec1e902e006730f68bde0a4334e5b819a12a475 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.
Diffstat (limited to 'app/models/media_attachment.rb')
| -rw-r--r-- | app/models/media_attachment.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index 6f079dd18..f2b34e4cd 100644 --- 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', |