diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-11-03 14:36:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 14:36:34 -0500 |
| commit | a4608141820800a068561796de3fe4e7f20e5423 (patch) | |
| tree | a3d82ae01b43ef792c8e347ff4c837c5ab6e48a7 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 5d5fa55fe523d516edea2ec134c56ac7eda0ae38 (diff) | |
| parent | d4474d493b6813135d3b2bf2e9e4f8a4756bf594 (diff) | |
Merge pull request #1904 from JustAMan/hls-move-2
Switch ffmpeg to hls muxer (from segment) to fix premature stop on non-patched ffmpeg
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"; } |