aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml14
-rw-r--r--config/production.yaml.example16
2 files changed, 29 insertions, 1 deletions
diff --git a/config/default.yaml b/config/default.yaml
index b9e382fa7..283e0ab93 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -223,11 +223,20 @@ user:
223# Please, do not disable transcoding since many uploaded videos will not work 223# Please, do not disable transcoding since many uploaded videos will not work
224transcoding: 224transcoding:
225 enabled: true 225 enabled: true
226
226 # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos 227 # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos
227 allow_additional_extensions: true 228 allow_additional_extensions: true
229
228 # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file 230 # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
229 allow_audio_files: true 231 allow_audio_files: true
232
230 threads: 1 233 threads: 1
234
235 # Choose the transcoding profile
236 # New profiles can be added by plugins
237 # Available in core PeerTube: 'default'
238 profile: 'default'
239
231 resolutions: # Only created if the original video has a higher resolution, uses more storage! 240 resolutions: # Only created if the original video has a higher resolution, uses more storage!
232 0p: false # audio-only (creates mp4 without video stream, always created when enabled) 241 0p: false # audio-only (creates mp4 without video stream, always created when enabled)
233 240p: false 242 240p: false
@@ -283,6 +292,11 @@ live:
283 enabled: true 292 enabled: true
284 threads: 2 293 threads: 2
285 294
295 # Choose the transcoding profile
296 # New profiles can be added by plugins
297 # Available in core PeerTube: 'default'
298 profile: 'default'
299
286 resolutions: 300 resolutions:
287 240p: false 301 240p: false
288 360p: false 302 360p: false
diff --git a/config/production.yaml.example b/config/production.yaml.example
index b616c6ced..66c981dd5 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -236,11 +236,20 @@ user:
236# Please, do not disable transcoding since many uploaded videos will not work 236# Please, do not disable transcoding since many uploaded videos will not work
237transcoding: 237transcoding:
238 enabled: true 238 enabled: true
239
239 # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos 240 # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos
240 allow_additional_extensions: true 241 allow_additional_extensions: true
242
241 # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file 243 # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
242 allow_audio_files: true 244 allow_audio_files: true
245
243 threads: 1 246 threads: 1
247
248 # Choose the transcoding profile
249 # New profiles can be added by plugins
250 # Available in core PeerTube: 'default'
251 profile: 'default'
252
244 resolutions: # Only created if the original video has a higher resolution, uses more storage! 253 resolutions: # Only created if the original video has a higher resolution, uses more storage!
245 0p: false # audio-only (creates mp4 without video stream, always created when enabled) 254 0p: false # audio-only (creates mp4 without video stream, always created when enabled)
246 240p: false 255 240p: false
@@ -270,7 +279,7 @@ live:
270 enabled: false 279 enabled: false
271 280
272 # Limit lives duration 281 # Limit lives duration
273 # Set null to disable duration limit 282 # -1 == unlimited
274 max_duration: -1 # For example: '5 hours' 283 max_duration: -1 # For example: '5 hours'
275 284
276 # Limit max number of live videos created on your instance 285 # Limit max number of live videos created on your instance
@@ -296,6 +305,11 @@ live:
296 enabled: true 305 enabled: true
297 threads: 2 306 threads: 2
298 307
308 # Choose the transcoding profile
309 # New profiles can be added by plugins
310 # Available in core PeerTube: 'default'
311 profile: 'default'
312
299 resolutions: 313 resolutions:
300 240p: false 314 240p: false
301 360p: false 315 360p: false