IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/audio-upload' into develop

Browse Source
This commit is contained in:
Chocobozzz
2019-05-21 10:05:12 +02:00
parent fd822c1c69 618750486e
commit 73b3aa6429
61 changed files with 647 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/default.yaml
View File

@@ -180,6 +180,8 @@ transcoding:
enabled: true
# Allow your users to upload .mkv, .mov, .avi, .flv videos
allow_additional_extensions: true
# If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
allow_audio_files: true
threads: 1
resolutions: # Only created if the original video has a higher resolution, uses more storage!
240p: false

2
config/production.yaml.example
View File

@@ -188,6 +188,8 @@ transcoding:
enabled: true
# Allow your users to upload .mkv, .mov, .avi, .flv videos
allow_additional_extensions: true
# If a user uploads an audio file, PeerTube will create a video by merging the preview file and the audio file
allow_audio_files: true
threads: 1
resolutions: # Only created if the original video has a higher resolution, uses more storage!
240p: false

1
config/test-2.yaml
View File

@@ -31,3 +31,4 @@ signup:
transcoding:
enabled: true
allow_additional_extensions: true
allow_audio_files: true

1
config/test.yaml
View File

@@ -55,6 +55,7 @@ signup:
transcoding:
enabled: true
allow_additional_extensions: false
allow_audio_files: false
threads: 2
resolutions:
240p: true