aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/default.yaml6
-rw-r--r--config/production.yaml.example6
2 files changed, 12 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml
index 7e07165b9..3a577d31d 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -403,6 +403,9 @@ transcoding:
403 1440p: false 403 1440p: false
404 2160p: false 404 2160p: false
405 405
406 # Transcode and keep original resolution, even if it's above your maximum enabled resolution
407 always_transcode_original_resolution: true
408
406 # Generate videos in a WebTorrent format (what we do since the first PeerTube release) 409 # Generate videos in a WebTorrent format (what we do since the first PeerTube release)
407 # If you also enabled the hls format, it will multiply videos storage by 2 410 # If you also enabled the hls format, it will multiply videos storage by 2
408 # If disabled, breaks federation with PeerTube instances < 2.1 411 # If disabled, breaks federation with PeerTube instances < 2.1
@@ -496,6 +499,9 @@ live:
496 1440p: false 499 1440p: false
497 2160p: false 500 2160p: false
498 501
502 # Also transcode original resolution, even if it's above your maximum enabled resolution
503 always_transcode_original_resolution: true
504
499video_studio: 505video_studio:
500 # Enable video edition by users (cut, add intro/outro, add watermark etc) 506 # Enable video edition by users (cut, add intro/outro, add watermark etc)
501 # If enabled, users can create transcoding tasks as they wish 507 # If enabled, users can create transcoding tasks as they wish
diff --git a/config/production.yaml.example b/config/production.yaml.example
index 042f5a641..b5ea7fec5 100644
--- a/config/production.yaml.example
+++ b/config/production.yaml.example
@@ -413,6 +413,9 @@ transcoding:
413 1440p: false 413 1440p: false
414 2160p: false 414 2160p: false
415 415
416 # Transcode and keep original resolution, even if it's above your maximum enabled resolution
417 always_transcode_original_resolution: true
418
416 # Generate videos in a WebTorrent format (what we do since the first PeerTube release) 419 # Generate videos in a WebTorrent format (what we do since the first PeerTube release)
417 # If you also enabled the hls format, it will multiply videos storage by 2 420 # If you also enabled the hls format, it will multiply videos storage by 2
418 # If disabled, breaks federation with PeerTube instances < 2.1 421 # If disabled, breaks federation with PeerTube instances < 2.1
@@ -506,6 +509,9 @@ live:
506 1440p: false 509 1440p: false
507 2160p: false 510 2160p: false
508 511
512 # Also transcode original resolution, even if it's above your maximum enabled resolution
513 always_transcode_original_resolution: true
514
509video_studio: 515video_studio:
510 # Enable video edition by users (cut, add intro/outro, add watermark etc) 516 # Enable video edition by users (cut, add intro/outro, add watermark etc)
511 # If enabled, users can create transcoding tasks as they wish 517 # If enabled, users can create transcoding tasks as they wish