Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 6 insertions, 6 deletions

diff --git a/tests/Jellyfin.Controller.Tests/DirectoryServiceTests.cs b/tests/Jellyfin.Controller.Tests/DirectoryServiceTests.cs
index feffb50e8..46439aecb 100644
--- a/tests/Jellyfin.Controller.Tests/DirectoryServiceTests.cs
+++ b/tests/Jellyfin.Controller.Tests/DirectoryServiceTests.cs
@@ -13,22 +13,22 @@ namespace Jellyfin.Controller.Tests
 
         private static readonly FileSystemMetadata[] _lowerCaseFileSystemMetadata =
         {
-            new ()
+            new()
             {
                 FullName = LowerCasePath + "/Artwork",
                 IsDirectory = true
             },
-            new ()
+            new()
             {
                 FullName = LowerCasePath + "/Some Other Folder",
                 IsDirectory = true
             },
-            new ()
+            new()
             {
                 FullName = LowerCasePath + "/Song 2.mp3",
                 IsDirectory = false
             },
-            new ()
+            new()
             {
                 FullName = LowerCasePath + "/Song 3.mp3",
                 IsDirectory = false
@@ -37,12 +37,12 @@ namespace Jellyfin.Controller.Tests
 
         private static readonly FileSystemMetadata[] _upperCaseFileSystemMetadata =
         {
-            new ()
+            new()
             {
                 FullName = UpperCasePath + "/Lyrics",
                 IsDirectory = true
             },
-            new ()
+            new()
             {
                 FullName = UpperCasePath + "/Song 1.mp3",
                 IsDirectory = false