diff options
| author | cvium <clausvium@gmail.com> | 2021-11-08 10:38:08 +0100 |
|---|---|---|
| committer | cvium <clausvium@gmail.com> | 2021-11-08 10:38:08 +0100 |
| commit | f03e77a4d5fa0ca81ecb11f0ffc4c14706a6dd7d (patch) | |
| tree | 06ae22d6e13ac26ab9dcb97e54591ad55654d3e1 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 153e9202397f236a4a415bd033c3b398b6e6573c (diff) | |
| parent | 83859a1e6d96cbb60a3b43f7537c0ab0fbdff510 (diff) | |
Merge branch 'master' into TVFix
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) |