cvium c658a883a2 Merge branch 'master' into keyframe_extraction_v1 ... # Conflicts: # Jellyfin.Api/Controllers/DynamicHlsController.cs # MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs # MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs		2022-01-07 10:23:22 +01:00
..
HlsAudioRequestDto.cs	Move DynamicHlsService to Jellyfin.Api	2020-07-31 15:09:17 -06:00
HlsVideoRequestDto.cs	Move DynamicHlsService to Jellyfin.Api	2020-07-31 15:09:17 -06:00
StreamingRequestDto.cs	Add dto changes	2021-09-23 15:51:46 +02:00
StreamState.cs	Fix warning: The nullable warning suppression expression is redundant (#2149)	2021-10-03 10:43:41 +07:00
VideoRequestDto.cs	Move AudioService to Jellyfin.Api	2020-07-22 16:57:06 +02:00