diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-04 10:03:18 -0500 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-04 10:03:18 -0500 |
| commit | 1600d5b53f89ad4f1af39a6a53d0ef251341b278 (patch) | |
| tree | 12f5483eba2396ad9b8da2e46f6a0ced073cf5e7 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 90dfe729bb9f8929bf584b93f93aabd84abbef3d (diff) | |
| parent | 9756bdb76ea625c19b6743a34ec95759d3f6d050 (diff) | |
Merge remote-tracking branch 'origin/master' into media-attachments-clean
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index d896a7aef..4dfb27130 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -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"; } |