Merge branch 'dev' into code-cleanup

MediaBrowser.Model/Entities/MediaStream.cs

@@ -420,7 +420,7 @@ namespace MediaBrowser.Model.Entities
 
             var fromCodec = Codec;
 
-            // Can't convert from this 
+            // Can't convert from this
             if (StringHelper.EqualsIgnoreCase(fromCodec, "ass"))
             {
                 return false;
@@ -430,7 +430,7 @@ namespace MediaBrowser.Model.Entities
                 return false;
             }
 
-            // Can't convert to this 
+            // Can't convert to this
             if (StringHelper.EqualsIgnoreCase(toCodec, "ass"))
             {
                 return false;

MediaBrowser.Model/Entities/ProviderIdsExtensions.cs

@@ -18,7 +18,7 @@ namespace MediaBrowser.Model.Entities
         {
             return !string.IsNullOrEmpty(instance.GetProviderId(provider.ToString()));
         }
-        
+
         /// <summary>
         /// Gets a provider id
         /// </summary>
@@ -65,7 +65,7 @@ namespace MediaBrowser.Model.Entities
             {
                 throw new ArgumentNullException(nameof(instance));
             }
-            
+
             // If it's null remove the key from the dictionary
             if (string.IsNullOrEmpty(value))
             {