diff options
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 2 | ||||
-rw-r--r-- | config/production.yaml.example | 2 | ||||
-rw-r--r-- | config/test-2.yaml | 1 | ||||
-rw-r--r-- | config/test.yaml | 1 |
4 files changed, 6 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 |
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-2.yaml b/config/test-2.yaml index a5515afa4..de7300366 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml | |||
@@ -31,3 +31,4 @@ signup: | |||
31 | transcoding: | 31 | transcoding: |
32 | enabled: true | 32 | enabled: true |
33 | allow_additional_extensions: true | 33 | allow_additional_extensions: true |
34 | allow_audio_files: true | ||
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 |