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/production.yaml.example | |
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/production.yaml.example')
-rw-r--r-- | config/production.yaml.example | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/production.yaml.example b/config/production.yaml.example index f84e15670..0ab99ac45 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -188,6 +188,8 @@ transcoding: | |||
188 | enabled: true | 188 | enabled: true |
189 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | 189 | # Allow your users to upload .mkv, .mov, .avi, .flv videos |
190 | allow_additional_extensions: true | 190 | allow_additional_extensions: true |
191 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | ||
192 | allow_audio_files: true | ||
191 | threads: 1 | 193 | threads: 1 |
192 | resolutions: # Only created if the original video has a higher resolution, uses more storage! | 194 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
193 | 240p: false | 195 | 240p: false |