diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-11-05 10:13:37 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-11-05 10:13:37 +0100 |
| commit | 5d9e4eaabe87ff1b115114b01075b9fabd2b0c5e (patch) | |
| tree | c477d10c7c907537d3d73ad8391dfecb0f01c5f3 /config | |
| parent | 41eac41b0583bc9b277ae872b1b56a210ba7c29c (diff) | |
| download | PeerTube-5d9e4eaabe87ff1b115114b01075b9fabd2b0c5e.tar.gz PeerTube-5d9e4eaabe87ff1b115114b01075b9fabd2b0c5e.tar.zst PeerTube-5d9e4eaabe87ff1b115114b01075b9fabd2b0c5e.zip | |
Add ability to enabled HLS in the admin panel
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 3 | ||||
| -rw-r--r-- | config/production.yaml.example | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/config/default.yaml b/config/default.yaml index 5ebfdeddb..b16ebe934 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -209,8 +209,7 @@ transcoding: | |||
| 209 | 720p: false | 209 | 720p: false |
| 210 | 1080p: false | 210 | 1080p: false |
| 211 | 2160p: false | 211 | 2160p: false |
| 212 | # /!\ EXPERIMENTAL /!\ | 212 | # /!\ Requires ffmpeg >= 4.1 |
| 213 | # /!\ Requires ffmpeg >= 4 | ||
| 214 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: | 213 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
| 215 | # * Resolution change is smoother | 214 | # * Resolution change is smoother |
| 216 | # * Faster playback in particular with long videos | 215 | # * Faster playback in particular with long videos |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 96d676a35..d563c7cf2 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -223,8 +223,7 @@ transcoding: | |||
| 223 | 720p: false | 223 | 720p: false |
| 224 | 1080p: false | 224 | 1080p: false |
| 225 | 2160p: false | 225 | 2160p: false |
| 226 | # /!\ EXPERIMENTAL /!\ | 226 | # /!\ Requires ffmpeg >= 4.1 |
| 227 | # /!\ Requires ffmpeg >= 4 | ||
| 228 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: | 227 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
| 229 | # * Resolution change is smoother | 228 | # * Resolution change is smoother |
| 230 | # * Faster playback in particular with long videos | 229 | # * Faster playback in particular with long videos |