diff options
| author | cvium <clausvium@gmail.com> | 2021-09-25 20:52:09 +0200 |
|---|---|---|
| committer | cvium <clausvium@gmail.com> | 2021-09-25 20:52:09 +0200 |
| commit | 30f3be1da0958dc9c129d09de13625b13f33a3a6 (patch) | |
| tree | 0b61f595e1fe1699c85d87358ccbb75cbde961c0 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 3e5cb8e04e11d05b4af54e88686e829429305870 (diff) | |
| parent | 17273a6075e2735642075c6060eb86fc910474a9 (diff) | |
Merge branch 'master' into keyframe_extraction_v1
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) |