diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-05-21 10:05:12 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-05-21 10:05:12 +0200 |
| commit | 73b3aa6429dfb2e31628fa09a479dce318289d7d (patch) | |
| tree | 88cf5c7c49ba89c18633a4a64a4acfc8d40b4a50 /server/controllers/api/config.ts | |
| parent | fd822c1c699fb89bb1c3218e047e1d842bc1ba1a (diff) | |
| parent | 618750486ee2732e0ad3525349e4d42f29e1803e (diff) | |
| download | PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.tar.gz PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.tar.zst PeerTube-73b3aa6429dfb2e31628fa09a479dce318289d7d.zip | |
Merge branch 'feature/audio-upload' into develop
Diffstat (limited to 'server/controllers/api/config.ts')
| -rw-r--r-- | server/controllers/api/config.ts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 40012c03b..d9ce6a153 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts | |||
| @@ -255,6 +255,7 @@ function customConfig (): CustomConfig { | |||
| 255 | transcoding: { | 255 | transcoding: { |
| 256 | enabled: CONFIG.TRANSCODING.ENABLED, | 256 | enabled: CONFIG.TRANSCODING.ENABLED, |
| 257 | allowAdditionalExtensions: CONFIG.TRANSCODING.ALLOW_ADDITIONAL_EXTENSIONS, | 257 | allowAdditionalExtensions: CONFIG.TRANSCODING.ALLOW_ADDITIONAL_EXTENSIONS, |
| 258 | allowAudioFiles: CONFIG.TRANSCODING.ALLOW_AUDIO_FILES, | ||
| 258 | threads: CONFIG.TRANSCODING.THREADS, | 259 | threads: CONFIG.TRANSCODING.THREADS, |
| 259 | resolutions: { | 260 | resolutions: { |
| 260 | '240p': CONFIG.TRANSCODING.RESOLUTIONS[ '240p' ], | 261 | '240p': CONFIG.TRANSCODING.RESOLUTIONS[ '240p' ], |