mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-22 13:40:37 +02:00
Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1
Revert "Fix segment_time_delta for ffmpeg 4.1"
This commit is contained in:
commit
13f1ea2c19
|
@ -936,10 +936,10 @@ namespace MediaBrowser.Api.Playback.Hls
|
||||||
|
|
||||||
var timeDeltaParam = string.Empty;
|
var timeDeltaParam = string.Empty;
|
||||||
|
|
||||||
if (isEncoding && state.TargetFramerate > 0)
|
if (isEncoding && startNumber > 0)
|
||||||
{
|
{
|
||||||
float startTime = 1 / (state.TargetFramerate.Value * 2);
|
var startTime = state.SegmentLength * startNumber;
|
||||||
timeDeltaParam = string.Format("-segment_time_delta {0}", Math.Round(startTime, 3));
|
timeDeltaParam = string.Format("-segment_time_delta -{0}", startTime);
|
||||||
}
|
}
|
||||||
|
|
||||||
var segmentFormat = GetSegmentFileExtension(state.Request).TrimStart('.');
|
var segmentFormat = GetSegmentFileExtension(state.Request).TrimStart('.');
|
||||||
|
|
Loading…
Reference in a new issue