jellyfin/MediaBrowser.Controller/MediaEncoding
Patrick Barron 06f9cde22f Merge branch 'master' into userdb-efcore
# Conflicts:
#	Emby.Server.Implementations/EntryPoints/ServerEventNotifier.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Emby.Server.Implementations/Sorting/IsFavoriteOrLikeComparer.cs
#	Emby.Server.Implementations/Sorting/IsPlayedComparer.cs
#	Emby.Server.Implementations/Sorting/IsUnplayedComparer.cs
#	Emby.Server.Implementations/TV/TVSeriesManager.cs
#	Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
2020-06-04 16:52:23 -04:00
..
EncodingHelper.cs Merge branch 'master' into userdb-efcore 2020-06-04 16:52:23 -04:00
EncodingJobInfo.cs Merge branch 'master' into userdb-efcore 2020-06-04 16:52:23 -04:00
EncodingJobOptions.cs Fix warnings 2020-01-31 22:26:53 +01:00
IAttachmentExtractor.cs Fix build and address comments 2020-01-08 01:23:57 +09:00
IEncodingManager.cs Address comments 2020-04-01 19:05:41 +02:00
ImageEncodingOptions.cs Reformat JustAMan review pt2 changes 2019-01-17 20:24:39 +01:00
IMediaEncoder.cs Make probesize and analyzeduration configurable and simplify circular 2019-11-25 12:07:59 +01:00
ISubtitleEncoder.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00
JobLogger.cs Merge pull request #2357 from Bond-009/warn13 2020-02-03 17:15:03 +09:00
MediaEncoderHelpers.cs Fix more warnings 2019-09-01 18:39:23 +02:00
MediaInfoRequest.cs Find+Sed BOM removal *.cs: Jellyfin.Server-MediaBrowser.Controller 2019-01-13 21:01:16 +01:00