diff options
| author | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-11 12:50:36 +0100 |
|---|---|---|
| committer | Erwin de Haan <EraYaN@users.noreply.github.com> | 2019-01-11 12:50:36 +0100 |
| commit | e2751d42e8775596b7c4b929fd004d879f980947 (patch) | |
| tree | da1d6e703abbb6a47cd64730603f06dc4b51df8f /MediaBrowser.Model/Entities | |
| parent | ec1f5dc317182582ebff843c9e8a4d5277405469 (diff) | |
| parent | e5c2dbdf23267006ef151d6ee8ab1cea147123d7 (diff) | |
Merge branch 'dev' into code-cleanup
Diffstat (limited to 'MediaBrowser.Model/Entities')
| -rw-r--r-- | MediaBrowser.Model/Entities/MediaStream.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Entities/ProviderIdsExtensions.cs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs index 35369fbbb..454e6ff16 100644 --- a/MediaBrowser.Model/Entities/MediaStream.cs +++ b/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; diff --git a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs b/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs index 0f096bc4a..3f8873798 100644 --- a/MediaBrowser.Model/Entities/ProviderIdsExtensions.cs +++ b/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)) { |