aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Net
diff options
context:
space:
mode:
authorClaus Vium <cvium@users.noreply.github.com>2021-12-15 08:38:39 +0100
committerGitHub <noreply@github.com>2021-12-15 08:38:39 +0100
commit9a0618552b87241537590e77c70cfdbac2b0b8ce (patch)
treeefc0d946cd6fc9db7b09e85cfa4185120e007c57 /MediaBrowser.Model/Net
parentc3c4dc6839d19cda8b0ea3cdcdc84547a713506d (diff)
parent4a58582ad588eae0571eb6e7f1c830d5550709ea (diff)
Merge branch 'master' into what_could_go_wrong
Diffstat (limited to 'MediaBrowser.Model/Net')
-rw-r--r--MediaBrowser.Model/Net/MimeTypes.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs
index 506e8e9d6..3b03466e9 100644
--- a/MediaBrowser.Model/Net/MimeTypes.cs
+++ b/MediaBrowser.Model/Net/MimeTypes.cs
@@ -116,7 +116,7 @@ namespace MediaBrowser.Model.Net
{ "audio/x-wavpack", ".wv" },
// Type image
- { "image/jpg", ".jpg" },
+ { "image/jpeg", ".jpg" },
{ "image/x-png", ".png" },
// Type text
@@ -137,7 +137,7 @@ namespace MediaBrowser.Model.Net
/// <param name="filename">The filename to find the MIME type of.</param>
/// <param name="defaultValue">The default value to return if no fitting MIME type is found.</param>
/// <returns>The correct MIME type for the given filename, or <paramref name="defaultValue"/> if it wasn't found.</returns>
- [return: NotNullIfNotNullAttribute("defaultValue")]
+ [return: NotNullIfNotNull("defaultValue")]
public static string? GetMimeType(string filename, string? defaultValue = null)
{
if (filename.Length == 0)