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

update .net core startup

Browse Source
This commit is contained in:
Luke Pulverenti
2016-11-13 16:04:21 -05:00
parent 3c55747cd6
commit 0e9cd51f9c
38 changed files with 355 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
View File

@@ -37,15 +37,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
output = GetProcessOutput(encoderAppPath, "-version");
}
catch
catch (Exception ex)
{
}
output = output ?? string.Empty;
if (logOutput)
{
_logger.Info("ffmpeg info: {0}", output);
if (logOutput)
{
_logger.ErrorException("Error validating encoder", ex);
}
}
if (string.IsNullOrWhiteSpace(output))
@@ -53,6 +50,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
return false;
}
if (logOutput)
{
_logger.Info("ffmpeg info: {0}", output);
}
if (output.IndexOf("Libav developers", StringComparison.OrdinalIgnoreCase) != -1)
{
return false;