Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

Browse source

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

...

This commit is contained in:

David 2020-07-22 11:02:44 +02:00

parent eae665a9c4 5b57c81ee1

commit 90039e1ad3

724 changed files with 8326 additions and 5490 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

600

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

View file

File diff suppressed because it is too large Load diff