aboutsummaryrefslogtreecommitdiffhomepage
path: root/config
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-10-06 10:40:09 +0200
committerChocobozzz <florian.bigard@gmail.com>2017-10-06 11:03:09 +0200
commitaa8b6df4a51c82eb91e6fd71a090b2128098af6b (patch)
treeb2d6292ceb34ad71a1ce9b671f0d87923f6c7c21 /config
parent127d96b969891a73d76e257581e5fd81cd867480 (diff)
downloadPeerTube-aa8b6df4a51c82eb91e6fd71a090b2128098af6b.tar.gz
PeerTube-aa8b6df4a51c82eb91e6fd71a090b2128098af6b.tar.zst
PeerTube-aa8b6df4a51c82eb91e6fd71a090b2128098af6b.zip
Client: handle multiple file resolutions
Diffstat (limited to 'config')
-rw-r--r--config/test-1.yaml3
-rw-r--r--config/test-3.yaml3
-rw-r--r--config/test-4.yaml3
-rw-r--r--config/test-5.yaml3
-rw-r--r--config/test-6.yaml3
-rw-r--r--config/test.yaml4
6 files changed, 19 insertions, 0 deletions
diff --git a/config/test-1.yaml b/config/test-1.yaml
index 4e9f29435..d9b4d2b1a 100644
--- a/config/test-1.yaml
+++ b/config/test-1.yaml
@@ -26,3 +26,6 @@ user:
26 26
27signup: 27signup:
28 limit: 4 28 limit: 4
29
30transcoding:
31 enabled: false
diff --git a/config/test-3.yaml b/config/test-3.yaml
index a29225a44..291b43edc 100644
--- a/config/test-3.yaml
+++ b/config/test-3.yaml
@@ -20,3 +20,6 @@ storage:
20 20
21admin: 21admin:
22 email: 'admin3@example.com' 22 email: 'admin3@example.com'
23
24transcoding:
25 enabled: false
diff --git a/config/test-4.yaml b/config/test-4.yaml
index da93e128d..6f80939fc 100644
--- a/config/test-4.yaml
+++ b/config/test-4.yaml
@@ -20,3 +20,6 @@ storage:
20 20
21admin: 21admin:
22 email: 'admin4@example.com' 22 email: 'admin4@example.com'
23
24transcoding:
25 enabled: false
diff --git a/config/test-5.yaml b/config/test-5.yaml
index f95e25eb8..0b5eab72e 100644
--- a/config/test-5.yaml
+++ b/config/test-5.yaml
@@ -20,3 +20,6 @@ storage:
20 20
21admin: 21admin:
22 email: 'admin5@example.com' 22 email: 'admin5@example.com'
23
24transcoding:
25 enabled: false
diff --git a/config/test-6.yaml b/config/test-6.yaml
index 87d054439..5d33e45b9 100644
--- a/config/test-6.yaml
+++ b/config/test-6.yaml
@@ -20,3 +20,6 @@ storage:
20 20
21admin: 21admin:
22 email: 'admin6@example.com' 22 email: 'admin6@example.com'
23
24transcoding:
25 enabled: false
diff --git a/config/test.yaml b/config/test.yaml
index 1a08d5ed1..feecb7883 100644
--- a/config/test.yaml
+++ b/config/test.yaml
@@ -10,3 +10,7 @@ database:
10 10
11signup: 11signup:
12 enabled: true 12 enabled: true
13
14transcoding:
15 enabled: true
16 threads: 4