alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into media-attachments-clean

Browse Source
This commit is contained in:
Andrew Mahone
2019-11-04 10:03:18 -05:00
parent 90dfe729bb 9756bdb76e
commit 1600d5b53f
143 changed files with 1776 additions and 1217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -2168,7 +2168,8 @@ namespace MediaBrowser.Controller.MediaEncoding
// Important: If this is ever re-enabled, make sure not to use it with wtv because it breaks seeking
if (!string.Equals(state.InputContainer, "wtv", StringComparison.OrdinalIgnoreCase)
&& state.TranscodingType != TranscodingJobType.Progressive
&& state.EnableBreakOnNonKeyFrames(outputVideoCodec))
&& !state.EnableBreakOnNonKeyFrames(outputVideoCodec)
&& (state.BaseRequest.StartTimeTicks ?? 0) > 0)
{
inputModifier += " -noaccurate_seek";
}