alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-01 16:02:29 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #1904 from JustAMan/hls-move-2

Browse Source 
Switch ffmpeg to hls muxer (from segment) to fix premature stop on non-patched ffmpeg

(cherry picked from commit a460814182)
Signed-off-by: Joshua Boniface <joshua@boniface.me>
This commit is contained in:
Joshua M. Boniface
2019-11-03 14:36:34 -05:00
committed by Joshua Boniface
parent 1fad64cd59
commit 7a592a0f15
4 changed files with 86 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@@ -539,6 +539,11 @@ namespace Emby.Server.Implementations.HttpServer
}
finally
{
if (httpRes.StatusCode >= 500)
{
_logger.LogDebug("Sending HTTP Response 500 in response to {Url}", urlToLog);
}
stopWatch.Stop();
var elapsed = stopWatch.Elapsed;
if (elapsed.TotalMilliseconds > 500)