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, 3 insertions, 3 deletions

diff --git a/src/Jellyfin.Extensions/Json/JsonDefaults.cs b/src/Jellyfin.Extensions/Json/JsonDefaults.cs
index f4ec91123..2cd89dc3b 100644
--- a/src/Jellyfin.Extensions/Json/JsonDefaults.cs
+++ b/src/Jellyfin.Extensions/Json/JsonDefaults.cs
@@ -25,7 +25,7 @@ namespace Jellyfin.Extensions.Json
         ///   -> AddJellyfinApi
         ///    -> AddJsonOptions.
         /// </summary>
-        private static readonly JsonSerializerOptions _jsonSerializerOptions = new ()
+        private static readonly JsonSerializerOptions _jsonSerializerOptions = new()
         {
             ReadCommentHandling = JsonCommentHandling.Disallow,
             WriteIndented = false,
@@ -44,12 +44,12 @@ namespace Jellyfin.Extensions.Json
             }
         };
 
-        private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new (_jsonSerializerOptions)
+        private static readonly JsonSerializerOptions _pascalCaseJsonSerializerOptions = new(_jsonSerializerOptions)
         {
             PropertyNamingPolicy = null
         };
 
-        private static readonly JsonSerializerOptions _camelCaseJsonSerializerOptions = new (_jsonSerializerOptions)
+        private static readonly JsonSerializerOptions _camelCaseJsonSerializerOptions = new(_jsonSerializerOptions)
         {
             PropertyNamingPolicy = JsonNamingPolicy.CamelCase
         };