alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-19 08:36:37 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into keyframe_extraction_v1

Browse Source
This commit is contained in:
cvium
2021-09-25 20:52:09 +02:00
parent 3e5cb8e04e 17273a6075
commit 30f3be1da0
132 changed files with 323 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View File

@@ -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)