diff options
| author | Chocobozzz <me@florianbigard.com> | 2018-12-11 14:52:50 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2018-12-11 15:11:09 +0100 |
| commit | 14e2014acc1362cfbb770c051a7254b156cd8efb (patch) | |
| tree | 8b7d5aedd9fe0beff8b971c9bae7781ba2069228 /config | |
| parent | 8923187455c5aa7167d813c5c745d3857f183fd7 (diff) | |
| download | PeerTube-14e2014acc1362cfbb770c051a7254b156cd8efb.tar.gz PeerTube-14e2014acc1362cfbb770c051a7254b156cd8efb.tar.zst PeerTube-14e2014acc1362cfbb770c051a7254b156cd8efb.zip | |
Support additional video extensions
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 2 | ||||
| -rw-r--r-- | config/production.yaml.example | 2 | ||||
| -rw-r--r-- | config/test-2.yaml | 1 | ||||
| -rw-r--r-- | config/test.yaml | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index d95fdc57b..080638a13 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -124,6 +124,8 @@ user: | |||
| 124 | # Please, do not disable transcoding since many uploaded videos will not work | 124 | # Please, do not disable transcoding since many uploaded videos will not work |
| 125 | transcoding: | 125 | transcoding: |
| 126 | enabled: true | 126 | enabled: true |
| 127 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | ||
| 128 | allow_additional_extensions: true | ||
| 127 | threads: 1 | 129 | threads: 1 |
| 128 | resolutions: # Only created if the original video has a higher resolution, uses more storage! | 130 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
| 129 | 240p: false | 131 | 240p: false |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 4c50a550b..770bb97da 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -137,6 +137,8 @@ user: | |||
| 137 | # Please, do not disable transcoding since many uploaded videos will not work | 137 | # Please, do not disable transcoding since many uploaded videos will not work |
| 138 | transcoding: | 138 | transcoding: |
| 139 | enabled: true | 139 | enabled: true |
| 140 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | ||
| 141 | allow_additional_extensions: true | ||
| 140 | threads: 1 | 142 | threads: 1 |
| 141 | resolutions: # Only created if the original video has a higher resolution, uses more storage! | 143 | resolutions: # Only created if the original video has a higher resolution, uses more storage! |
| 142 | 240p: false | 144 | 240p: false |
diff --git a/config/test-2.yaml b/config/test-2.yaml index a80ec6e54..b6d319394 100644 --- a/config/test-2.yaml +++ b/config/test-2.yaml | |||
| @@ -29,3 +29,4 @@ signup: | |||
| 29 | 29 | ||
| 30 | transcoding: | 30 | transcoding: |
| 31 | enabled: true | 31 | enabled: true |
| 32 | allow_additional_extensions: true | ||
diff --git a/config/test.yaml b/config/test.yaml index 51a77e2fd..6e9c56e0a 100644 --- a/config/test.yaml +++ b/config/test.yaml | |||
| @@ -51,6 +51,7 @@ signup: | |||
| 51 | 51 | ||
| 52 | transcoding: | 52 | transcoding: |
| 53 | enabled: true | 53 | enabled: true |
| 54 | allow_additional_extensions: false | ||
| 54 | threads: 2 | 55 | threads: 2 |
| 55 | resolutions: | 56 | resolutions: |
| 56 | 240p: true | 57 | 240p: true |