mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-22 21:50:36 +02:00
c658a883a2
# Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs |
||
---|---|---|
.. | ||
Attachments | ||
BdInfo | ||
Configuration | ||
Encoder | ||
Probing | ||
Properties | ||
Subtitles | ||
MediaBrowser.MediaEncoding.csproj |