jellyfin-server/MediaBrowser.Api/Playback
Patrick Barron c1360a1dc3 Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln
2020-05-12 22:22:20 -04:00
..
Hls Merge pull request #2837 from Bond-009/async2 2020-05-06 20:30:03 +09:00
Progressive Remove FileSystem.GetStream 2020-01-22 22:20:35 +01:00
BaseStreamingService.cs Initial migration code 2020-05-12 22:10:35 -04:00
MediaInfoService.cs Initial migration code 2020-05-12 22:10:35 -04:00
StaticRemoteStreamWriter.cs ReSharper Reformat: Properties to expression bodied form. 2019-01-13 21:31:14 +01:00
StreamRequest.cs Fix warnings 2020-01-31 22:26:53 +01:00
StreamState.cs Add Transcoding framerate info 2020-01-24 23:33:32 +01:00
TranscodingThrottler.cs Remove custom Threading 2019-02-05 16:47:50 +01:00
UniversalAudioService.cs Remove unnecessary casts and explicit array types 2020-04-05 13:00:35 -04:00