diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 17:20:28 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-12 11:14:36 +0100 |
| commit | 7f8f8bdb4a1fb695a114874c4679605ac8911e2d (patch) | |
| tree | 44a853508884ea37ae4ac21057f24f009edd8d94 /config | |
| parent | 66d332340e2df628569c81448ab9e11287056541 (diff) | |
| download | PeerTube-7f8f8bdb4a1fb695a114874c4679605ac8911e2d.tar.gz PeerTube-7f8f8bdb4a1fb695a114874c4679605ac8911e2d.tar.zst PeerTube-7f8f8bdb4a1fb695a114874c4679605ac8911e2d.zip | |
HLS is only supported by ffmpeg 4
Because of https://github.com/FFmpeg/FFmpeg/commit/c8f625f52998faa9bf0fe22701f1684e51edfc07
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 6 | ||||
| -rw-r--r-- | config/production.yaml.example | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/config/default.yaml b/config/default.yaml index 5a83b271e..7af615a82 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -140,12 +140,12 @@ transcoding: | |||
| 140 | 720p: false | 140 | 720p: false |
| 141 | 1080p: false | 141 | 1080p: false |
| 142 | # /!\ EXPERIMENTAL /!\ | 142 | # /!\ EXPERIMENTAL /!\ |
| 143 | # /!\ Requires ffmpeg >= 3.4 | 143 | # /!\ Requires ffmpeg >= 4 |
| 144 | # Generate HLS playlist/segments. Better playback than with WebTorrent: | 144 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
| 145 | # * Resolution change is smoother | 145 | # * Resolution change is smoother |
| 146 | # * Faster playback in particular with long videos | 146 | # * Faster playback in particular with long videos |
| 147 | # * More stable playback (less bugs/infinite loading) | 147 | # * More stable playback (less bugs/infinite loading) |
| 148 | # /!\ Multiply videos storage by two /!\ | 148 | # /!\ Multiply videos storage by 2 /!\ |
| 149 | hls: | 149 | hls: |
| 150 | enabled: false | 150 | enabled: false |
| 151 | 151 | ||
diff --git a/config/production.yaml.example b/config/production.yaml.example index c54e1a516..413e3c478 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -153,12 +153,12 @@ transcoding: | |||
| 153 | 720p: false | 153 | 720p: false |
| 154 | 1080p: false | 154 | 1080p: false |
| 155 | # /!\ EXPERIMENTAL /!\ | 155 | # /!\ EXPERIMENTAL /!\ |
| 156 | # /!\ Requires ffmpeg >= 3.4 | 156 | # /!\ Requires ffmpeg >= 4 |
| 157 | # Generate HLS playlist/segments. Better playback than with WebTorrent: | 157 | # Generate HLS playlists and fragmented MP4 files. Better playback than with WebTorrent: |
| 158 | # * Resolution change is smoother | 158 | # * Resolution change is smoother |
| 159 | # * Faster playback in particular with long videos | 159 | # * Faster playback in particular with long videos |
| 160 | # * More stable playback (less bugs/infinite loading) | 160 | # * More stable playback (less bugs/infinite loading) |
| 161 | # /!\ Multiply videos storage by two /!\ | 161 | # /!\ Multiply videos storage by 2 /!\ |
| 162 | hls: | 162 | hls: |
| 163 | enabled: false | 163 | enabled: false |
| 164 | 164 | ||