diff options
| author | Bond-009 <bond.009@outlook.com> | 2021-09-25 19:21:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-25 19:21:37 +0200 |
| commit | 2ee3e9e00f62ff8b0139f1273d7666d0f6c549a4 (patch) | |
| tree | 354f808d6687abcd3b5f862c0cb8c9e4fd754966 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | d81c9a7a8cbab8967bfc66086c6f0f80bf7fc0c2 (diff) | |
| parent | 4643fd5dcbc6d1a4fbe973efc68d92ca71e3ab3b (diff) | |
Merge pull request #6590 from jellyfin/dotnet6
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index b09b7dba6..e92c4a08a 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -541,7 +541,12 @@ namespace MediaBrowser.Controller.MediaEncoding return MimeType; } - return MimeTypes.GetMimeType(outputPath, enableStreamDefault); + if (enableStreamDefault) + { + return MimeTypes.GetMimeType(outputPath); + } + + return MimeTypes.GetMimeType(outputPath, null); } public bool DeInterlace(string videoCodec, bool forceDeinterlaceIfSourceIsInterlaced) |