Murzaby/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-09-01 09:21:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge remote-tracking branch 'upstream/master' into register-services-correctly

Browse source
This commit is contained in:
Mark Monteiro 2020-04-20 20:11:33 -04:00
commit f815059698
70 changed files with 742 additions and 885 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View file

@ -470,7 +470,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
catch (Exception ex)
{
_logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {arguments}", inputArgument);
_logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {Arguments}", inputArgument);
}
}
@ -961,7 +961,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
public int? ExitCode { get; private set; }
void OnProcessExited(object sender, EventArgs e)
private void OnProcessExited(object sender, EventArgs e)
{
var process = (Process)sender;