starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-14 04:53:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into fmp4-hls

Browse Source
This commit is contained in:
nyanmisaka
2020-11-20 10:01:17 +08:00
parent ca33ace3e9 90e4066b12
commit b4598bd71b
186 changed files with 3475 additions and 3294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Jellyfin.Api/Helpers/TranscodingJobHelper.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
@@ -582,7 +582,7 @@ namespace Jellyfin.Api.Helpers
// Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
_ = new JobLogger(_logger).StartStreamingLog(state, process.StandardError.BaseStream, logStream);
// Wait for the file to exist before proceeeding
// Wait for the file to exist before proceeding
var ffmpegTargetFile = state.WaitForPath ?? outputPath;
_logger.LogDebug("Waiting for the creation of {0}", ffmpegTargetFile);
while (!File.Exists(ffmpegTargetFile) && !transcodingJob.HasExited)