diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 2 | ||||
| -rw-r--r-- | config/production.yaml.example | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/default.yaml b/config/default.yaml index d6f7f7afe..a3af1b15f 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -213,7 +213,7 @@ user: | |||
| 213 | # Please, do not disable transcoding since many uploaded videos will not work | 213 | # Please, do not disable transcoding since many uploaded videos will not work |
| 214 | transcoding: | 214 | transcoding: |
| 215 | enabled: true | 215 | enabled: true |
| 216 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | 216 | # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos |
| 217 | allow_additional_extensions: true | 217 | allow_additional_extensions: true |
| 218 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | 218 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file |
| 219 | allow_audio_files: true | 219 | allow_audio_files: true |
diff --git a/config/production.yaml.example b/config/production.yaml.example index f57861eca..c1e7c6c03 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -227,7 +227,7 @@ user: | |||
| 227 | # Please, do not disable transcoding since many uploaded videos will not work | 227 | # Please, do not disable transcoding since many uploaded videos will not work |
| 228 | transcoding: | 228 | transcoding: |
| 229 | enabled: true | 229 | enabled: true |
| 230 | # Allow your users to upload .mkv, .mov, .avi, .flv videos | 230 | # Allow your users to upload .mkv, .mov, .avi, .wmv, .flv, .f4v, .3g2, .3gp, .mts, m2ts, .mxf, .nut videos |
| 231 | allow_additional_extensions: true | 231 | allow_additional_extensions: true |
| 232 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file | 232 | # If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file |
| 233 | allow_audio_files: true | 233 | allow_audio_files: true |