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:
       1440p: false
       2160p: false
 
+video_editor:
+  # Enable video edition by users (cut, add intro/outro, add watermark etc)
+  enabled: false
+
 import:
   # Add ability for your users to import remote videos (from YouTube, torrent...)
   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:
       1440p: false
       2160p: false
 
+video_editor:
+  # Enable video edition by users (cut, add intro/outro, add watermark etc)
+  enabled: false
+
 import:
   # Add ability for your users to import remote videos (from YouTube, torrent...)
   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:
 transcoding:
   enabled: false
 
+video_editor:
+  enabled: false
+
 live:
   rtmp:
     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:
 
 transcoding:
   enabled: false
+
+video_editor:
+  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:
 
 transcoding:
   enabled: false
+
+video_editor:
+  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:
 
 transcoding:
   enabled: false
+
+video_editor:
+  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:
 
 transcoding:
   enabled: false
+
+video_editor:
+  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:
 
     local_buffer_update_interval: '5 seconds'
     ip_view_expiration: '1 second'
+
+video_editor:
+  enabled: true