diff options
author | Chocobozzz <me@florianbigard.com> | 2022-02-11 10:51:33 +0100 |
---|---|---|
committer | Chocobozzz <chocobozzz@cpy.re> | 2022-02-28 10:42:19 +0100 |
commit | c729caf6cc34630877a0e5a1bda1719384cd0c8a (patch) | |
tree | 1d2e13722e518c73d2c9e6f0969615e29d51cf8c /config | |
parent | a24bf4dc659cebb65d887862bf21d7a35e9ec791 (diff) | |
download | PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.tar.gz PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.tar.zst PeerTube-c729caf6cc34630877a0e5a1bda1719384cd0c8a.zip |
Add basic video editor support
Diffstat (limited to 'config')
-rw-r--r-- | config/default.yaml | 4 | ||||
-rw-r--r-- | config/production.yaml.example | 4 | ||||
-rw-r--r-- | config/test-1.yaml | 3 | ||||
-rw-r--r-- | config/test-3.yaml | 3 | ||||
-rw-r--r-- | config/test-4.yaml | 3 | ||||
-rw-r--r-- | config/test-5.yaml | 3 | ||||
-rw-r--r-- | config/test-6.yaml | 3 | ||||
-rw-r--r-- | config/test.yaml | 3 |
8 files changed, 26 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index 23be08f85..1e7fb9e5b 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
@@ -425,6 +425,10 @@ live: | |||
425 | 1440p: false | 425 | 1440p: false |
426 | 2160p: false | 426 | 2160p: false |
427 | 427 | ||
428 | video_editor: | ||
429 | # Enable video edition by users (cut, add intro/outro, add watermark etc) | ||
430 | enabled: false | ||
431 | |||
428 | import: | 432 | import: |
429 | # Add ability for your users to import remote videos (from YouTube, torrent...) | 433 | # Add ability for your users to import remote videos (from YouTube, torrent...) |
430 | videos: | 434 | videos: |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 675801caa..d1f18ecde 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
@@ -433,6 +433,10 @@ live: | |||
433 | 1440p: false | 433 | 1440p: false |
434 | 2160p: false | 434 | 2160p: false |
435 | 435 | ||
436 | video_editor: | ||
437 | # Enable video edition by users (cut, add intro/outro, add watermark etc) | ||
438 | enabled: false | ||
439 | |||
436 | import: | 440 | import: |
437 | # Add ability for your users to import remote videos (from YouTube, torrent...) | 441 | # Add ability for your users to import remote videos (from YouTube, torrent...) |
438 | videos: | 442 | videos: |
diff --git a/config/test-1.yaml b/config/test-1.yaml index d5f8299e0..0f6d56f1a 100644 --- a/config/test-1.yaml +++ b/config/test-1.yaml | |||
@@ -37,6 +37,9 @@ signup: | |||
37 | transcoding: | 37 | transcoding: |
38 | enabled: false | 38 | enabled: false |
39 | 39 | ||
40 | video_editor: | ||
41 | enabled: false | ||
42 | |||
40 | live: | 43 | live: |
41 | rtmp: | 44 | rtmp: |
42 | port: 1936 | 45 | port: 1936 |
diff --git a/config/test-3.yaml b/config/test-3.yaml index 594439b62..3cd3ddba7 100644 --- a/config/test-3.yaml +++ b/config/test-3.yaml | |||
@@ -30,3 +30,6 @@ admin: | |||
30 | 30 | ||
31 | transcoding: | 31 | transcoding: |
32 | enabled: false | 32 | enabled: false |
33 | |||
34 | video_editor: | ||
35 | enabled: false | ||
diff --git a/config/test-4.yaml b/config/test-4.yaml index 1e6368bf7..6d8e51945 100644 --- a/config/test-4.yaml +++ b/config/test-4.yaml | |||
@@ -30,3 +30,6 @@ admin: | |||
30 | 30 | ||
31 | transcoding: | 31 | transcoding: |
32 | enabled: false | 32 | enabled: false |
33 | |||
34 | video_editor: | ||
35 | enabled: false | ||
diff --git a/config/test-5.yaml b/config/test-5.yaml index 97f18a7a0..5f2157fec 100644 --- a/config/test-5.yaml +++ b/config/test-5.yaml | |||
@@ -30,3 +30,6 @@ admin: | |||
30 | 30 | ||
31 | transcoding: | 31 | transcoding: |
32 | enabled: false | 32 | enabled: false |
33 | |||
34 | video_editor: | ||
35 | enabled: false | ||
diff --git a/config/test-6.yaml b/config/test-6.yaml index 156da84d2..9c43d2b2e 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml | |||
@@ -30,3 +30,6 @@ admin: | |||
30 | 30 | ||
31 | transcoding: | 31 | transcoding: |
32 | enabled: false | 32 | enabled: false |
33 | |||
34 | video_editor: | ||
35 | enabled: false | ||
diff --git a/config/test.yaml b/config/test.yaml index 461e1b4ba..99bf85143 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
@@ -164,3 +164,6 @@ views: | |||
164 | 164 | ||
165 | local_buffer_update_interval: '5 seconds' | 165 | local_buffer_update_interval: '5 seconds' |
166 | ip_view_expiration: '1 second' | 166 | ip_view_expiration: '1 second' |
167 | |||
168 | video_editor: | ||
169 | enabled: true | ||