From fce897f326af14406ced2f71a00ae89ff297a550 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 4 May 2017 21:51:00 +0200 Subject: Server: add tests to video transcoder --- config/default.yaml | 2 +- config/test-2.yaml | 3 +++ config/test-6.yaml | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'config') 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: # If enabled, the video will be transcoded to mp4 (x264) with "faststart" flag # Uses a lot of CPU! transcoding: - enabled: true + enabled: false 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: signup: enabled: false + +transcoding: + 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: admin: email: 'admin6@example.com' - -transcoding: - enabled: true -- cgit v1.2.3