diff options
author | Chocobozzz <me@florianbigard.com> | 2019-05-16 16:55:34 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-05-16 17:16:47 +0200 |
commit | 536598cfafab1c5e24e881db1c528489f804fb6b (patch) | |
tree | 9d15e809218174622d68d21b0c7f0a73147187db /config | |
parent | 3daaa1927474869f8dbaddd6b94b4c071e314e10 (diff) | |
download | PeerTube-536598cfafab1c5e24e881db1c528489f804fb6b.tar.gz PeerTube-536598cfafab1c5e24e881db1c528489f804fb6b.tar.zst PeerTube-536598cfafab1c5e24e881db1c528489f804fb6b.zip |
Add audio support in upload
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 2 | ||||
-rw-r--r-- | config/production.yaml.example | 2 | ||||
-rw-r--r-- | config/test.yaml | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index 37ef4366f..9c9fd93dd 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -174,6 +174,8 @@ transcoding: | |||
174 | enabled: true | 174 | enabled: true |
175 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | 175 | # Allow your users to upload .mkv, .mov, .avi, .flv videos |
176 | allow_additional_extensions: true | 176 | allow_additional_extensions: true |
177 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | ||
178 | allow_audio_files: true | ||
177 | threads: 1 | 179 | threads: 1 |
178 | resolutions: # Only created if the original video has a higher resolution, uses more storage! | 180 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
179 | 240p: false | 181 | 240p: false |
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 |
diff --git a/config/test.yaml b/config/test.yaml index 682530840..7dabe433c 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -55,6 +55,7 @@ signup: | |||
55 | transcoding: | 55 | transcoding: |
56 | enabled: true | 56 | enabled: true |
57 | allow_additional_extensions: false | 57 | allow_additional_extensions: false |
58 | allow_audio_files: false | ||
58 | threads: 2 | 59 | threads: 2 |
59 | resolutions: | 60 | resolutions: |
60 | 240p: true | 61 | 240p: true |