merge master into api-migration

1 files changed, 4 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
index 8235b72d1..102db3b44 100644
--- a/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
+++ b/MediaBrowser.Model/Dlna/ResolutionNormalizer.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -17,7 +18,8 @@ namespace MediaBrowser.Model.Dlna
                 new ResolutionConfiguration(3840, 35000000)
             };
 
-        public static ResolutionOptions Normalize(int? inputBitrate,
+        public static ResolutionOptions Normalize(
+            int? inputBitrate,
             int? unused1,
             int? unused2,
             int outputBitrate,
@@ -83,6 +85,7 @@ namespace MediaBrowser.Model.Dlna
             {
                 return .5;
             }
+
             return 1;
         }