add channel watermark (#254)

* wip * wip * implement watermark settings * code cleanup * update changelog
2021-06-11 21:42:06 -05:00
parent 5b36252dd0
commit 0365d4c8f8
23 changed files with 3521 additions and 36 deletions
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 - Add experimental `HLS Hybrid` channel mode
  - Media items are transcoded using the channel's ffmpeg profile and served using HLS
+- Add optional channel watermark

 ### Changed
 - Remove framerate normalization; it caused more problems than it solved