diff options
| author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:46:08 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:46:08 +0100 |
| commit | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (patch) | |
| tree | 8ab32b39b6e17b9d754b64910ef76a4e6c5b118f /config | |
| parent | e79d0ba56c4d5518c6ccab74e805c449a43e1c76 (diff) | |
| download | PeerTube-9b712a2017e4ab3cf12cd6bd58278905520159d0.tar.gz PeerTube-9b712a2017e4ab3cf12cd6bd58278905520159d0.tar.zst PeerTube-9b712a2017e4ab3cf12cd6bd58278905520159d0.zip | |
Add ffmpeg version in config for hls transcoding
Diffstat (limited to 'config')
| -rw-r--r-- | config/default.yaml | 1 | ||||
| -rw-r--r-- | config/production.yaml.example | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/config/default.yaml b/config/default.yaml index ad0e6084b..5a83b271e 100644 --- a/config/default.yaml +++ b/config/default.yaml | |||
| @@ -140,6 +140,7 @@ transcoding: | |||
| 140 | 720p: false | 140 | 720p: false |
| 141 | 1080p: false | 141 | 1080p: false |
| 142 | # /!\ EXPERIMENTAL /!\ | 142 | # /!\ EXPERIMENTAL /!\ |
| 143 | # /!\ Requires ffmpeg >= 3.4 | ||
| 143 | # Generate HLS playlist/segments. Better playback than with WebTorrent: | 144 | # Generate HLS playlist/segments. Better playback than with WebTorrent: |
| 144 | # * Resolution change is smoother | 145 | # * Resolution change is smoother |
| 145 | # * Faster playback in particular with long videos | 146 | # * Faster playback in particular with long videos |
diff --git a/config/production.yaml.example b/config/production.yaml.example index 98734bab6..c54e1a516 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example | |||
| @@ -153,6 +153,7 @@ transcoding: | |||
| 153 | 720p: false | 153 | 720p: false |
| 154 | 1080p: false | 154 | 1080p: false |
| 155 | # /!\ EXPERIMENTAL /!\ | 155 | # /!\ EXPERIMENTAL /!\ |
| 156 | # /!\ Requires ffmpeg >= 3.4 | ||
| 156 | # Generate HLS playlist/segments. Better playback than with WebTorrent: | 157 | # Generate HLS playlist/segments. Better playback than with WebTorrent: |
| 157 | # * Resolution change is smoother | 158 | # * Resolution change is smoother |
| 158 | # * Faster playback in particular with long videos | 159 | # * Faster playback in particular with long videos |