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 /config/default.yaml | |
| 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 'config/default.yaml')
| -rw-r--r-- | config/default.yaml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index 27952d048..fcbbf17e8 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -180,6 +180,8 @@ transcoding: | |||
| 180 | enabled: true | 180 | enabled: true |
| 181 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | 181 | # Allow your users to upload .mkv, .mov, .avi, .flv videos |
| 182 | allow_additional_extensions: true | 182 | allow_additional_extensions: true |
| 183 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | ||
| 184 | allow_audio_files: true | ||
| 183 | threads: 1 | 185 | threads: 1 |
| 184 | resolutions: # Only created if the original video has a higher resolution, uses more storage! | 186 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
| 185 | 240p: false | 187 | 240p: false |