mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-03 19:55:02 -05:00
# Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs