diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-10-12 13:50:48 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-10-12 13:50:48 +0200 |
| commit | 10ef089102f2225c5ec3ed426bc612e4f2bc8655 (patch) | |
| tree | a92171db9114792a363e360bfb645c13d9ea4234 /server/initializers | |
| parent | c80e458afb63915163467fe9b3b147b3b4e4657d (diff) | |
| parent | 3c25d37aef66b125e8c66d38b04eb763f1b17bc6 (diff) | |
| download | PeerTube-10ef089102f2225c5ec3ed426bc612e4f2bc8655.tar.gz PeerTube-10ef089102f2225c5ec3ed426bc612e4f2bc8655.tar.zst PeerTube-10ef089102f2225c5ec3ed426bc612e4f2bc8655.zip | |
Merge branch 'release/3.4.0' into develop
Diffstat (limited to 'server/initializers')
| -rw-r--r-- | server/initializers/constants.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 2fa0aa7bf..facd3b721 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts | |||
| @@ -346,7 +346,7 @@ const VIEW_LIFETIME = { | |||
| 346 | let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour | 346 | let CONTACT_FORM_LIFETIME = 60000 * 60 // 1 hour |
| 347 | 347 | ||
| 348 | const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = { | 348 | const VIDEO_TRANSCODING_FPS: VideoTranscodingFPS = { |
| 349 | MIN: 10, | 349 | MIN: 1, |
| 350 | STANDARD: [ 24, 25, 30 ], | 350 | STANDARD: [ 24, 25, 30 ], |
| 351 | HD_STANDARD: [ 50, 60 ], | 351 | HD_STANDARD: [ 50, 60 ], |
| 352 | AVERAGE: 30, | 352 | AVERAGE: 30, |