aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2019-01-21 20:21:36 -0500
committerGitHub <noreply@github.com>2019-01-21 20:21:36 -0500
commit13f1ea2c19a5e092ea6d0b028199153d75b94b65 (patch)
tree9e98a2b2495d1322e61c57f0a186379479a69c50 /MediaBrowser.Api
parent9ad182502fe0f7eb1691080c7592e3fe1d97a3de (diff)
parentb2767eceff7da81a2c0624fccf1c69e6ec043f5c (diff)
Merge pull request #664 from jellyfin/revert-639-ffmpeg4.1
Revert "Fix segment_time_delta for ffmpeg 4.1"
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index a488576da..b3099e17e 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -936,10 +936,10 @@ namespace MediaBrowser.Api.Playback.Hls
var timeDeltaParam = string.Empty;
- if (isEncoding && state.TargetFramerate > 0)
+ if (isEncoding && startNumber > 0)
{
- float startTime = 1 / (state.TargetFramerate.Value * 2);
- timeDeltaParam = string.Format("-segment_time_delta {0}", Math.Round(startTime, 3));
+ var startTime = state.SegmentLength * startNumber;
+ timeDeltaParam = string.Format("-segment_time_delta -{0}", startTime);
}
var segmentFormat = GetSegmentFileExtension(state.Request).TrimStart('.');