diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-11-03 14:36:34 -0500 |
|---|---|---|
| committer | Joshua Boniface <joshua@boniface.me> | 2019-11-03 14:45:07 -0500 |
| commit | 7a592a0f15bfb2017234d80c3fa543fef17e332c (patch) | |
| tree | 58de550adffc88fa1372e0c2fe0b6912714b91c7 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 1fad64cd59cef86bec5f768f563ed9a9e5d63e3e (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
(cherry picked from commit a4608141820800a068561796de3fe4e7f20e5423)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
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"; } |