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

update ffmpeg path customization

Browse Source
This commit is contained in:
Luke Pulverenti
2016-06-20 02:45:35 -04:00
parent 6cb5b2cd72
commit fb07b4640c
3 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Server.Startup.Common/ApplicationHost.cs
View File

@@ -650,13 +650,13 @@ namespace MediaBrowser.Server.Startup.Common
var info = await new FFMpegLoader(Logger, ApplicationPaths, HttpClient, ZipClient, FileSystemManager, NativeApp.Environment, NativeApp.GetType().Assembly, NativeApp.GetFfmpegInstallInfo())
.GetFFMpegInfo(NativeApp.Environment, _startupOptions, progress).ConfigureAwait(false);
_hasExternalEncoder = !string.IsNullOrWhiteSpace(info.EncoderPath);
_hasExternalEncoder = string.Equals(info.Version, "custom", StringComparison.OrdinalIgnoreCase);
var mediaEncoder = new MediaEncoder(LogManager.GetLogger("MediaEncoder"),
JsonSerializer,
info.EncoderPath,
info.ProbePath,
info.Version,
_hasExternalEncoder,
ServerConfigurationManager,
FileSystemManager,
LiveTvManager,