Commit Graph

10 Commits

Author SHA1 Message Date
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
KonH
7c282ec369 Fix warning: The nullable warning suppression expression is redundant (#2149) 2021-10-03 10:43:41 +07:00
cvium
d995f0e092 Add dto changes 2021-09-23 15:51:46 +02:00
cvium
1603d1928e Kill ProgressiveFileCopier and seek to end for ongoing livetv 2021-09-10 09:29:14 +02:00
crobibero
f645e2f884 Move DynamicHlsService to Jellyfin.Api 2020-07-31 15:09:17 -06:00
David
ca3dcc3db0 Fix suggestions from review 2020-07-24 19:14:53 +02:00
David
d39f481a5c Apply suggestions from review 2020-07-23 12:46:54 +02:00
David
2ce97c022e Move AudioService to Jellyfin.Api 2020-07-22 16:57:06 +02:00
David
eae665a9c4 Add properties to StreamState to fix some errors 2020-07-22 10:57:27 +02:00
David
3514813eb4 Continute work 2020-07-19 19:03:48 +02:00