diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2017-05-04 21:51:00 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2017-05-04 21:51:00 +0200 |
| commit | fce897f326af14406ced2f71a00ae89ff297a550 (patch) | |
| tree | 96538ca4f10e068c5ee1909f005809b01b51fd53 /config | |
| parent | 227d02feadbc9b1fc916a12528ccc0623fb3069e (diff) | |
| download | PeerTube-fce897f326af14406ced2f71a00ae89ff297a550.tar.gz PeerTube-fce897f326af14406ced2f71a00ae89ff297a550.tar.zst PeerTube-fce897f326af14406ced2f71a00ae89ff297a550.zip | |
Server: add tests to video transcoder
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 2 | ||||
| -rw-r--r-- | config/test-2.yaml | 3 | ||||
| -rw-r--r-- | config/test-6.yaml | 3 |
3 files changed, 4 insertions, 4 deletions
diff --git a/config/default.yaml b/config/default.yaml index 27eb2a533..e03bf1aea 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -32,5 +32,5 @@ signup: | |||
| 32 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag | 32 | # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag |
| 33 | # Uses a lot of CPU! | 33 | # Uses a lot of CPU! |
| 34 | transcoding: | 34 | transcoding: |
| 35 | enabled: true | 35 | enabled: false |
| 36 | threads: 2 | 36 | threads: 2 |
diff --git a/config/test-2.yaml b/config/test-2.yaml index 77b2d6095..c95b9c229 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml | |||
| @@ -21,3 +21,6 @@ admin: | |||
| 21 | 21 | ||
| 22 | signup: | 22 | signup: |
| 23 | enabled: false | 23 | enabled: false |
| 24 | |||
| 25 | transcoding: | ||
| 26 | enabled: true | ||
diff --git a/config/test-6.yaml b/config/test-6.yaml index 169af973a..d74d3b052 100644 --- a/config/test-6.yaml +++ b/config/test-6.yaml | |||
| @@ -18,6 +18,3 @@ storage: | |||
| 18 | 18 | ||
| 19 | admin: | 19 | admin: |
| 20 | email: 'admin6@example.com' | 20 | email: 'admin6@example.com' |
| 21 | |||
| 22 | transcoding: | ||
| 23 | enabled: true | ||