cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

allow separate customization of ffmpeg/ffprobe paths

Browse Source
This commit is contained in:
Luke Pulverenti 2015-12-21 11:10:06 -05:00
parent 3061e6c876
commit c6a01e0370
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs
View File

@ -111,6 +111,16 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
DeleteOlderFolders(Path.GetDirectoryName(versionedDirectoryPath), excludeFromDeletions);
// Allow just one of these to be overridden, if desired.
if (!string.IsNullOrWhiteSpace(customffMpegPath))
{
info.EncoderPath = customffMpegPath;
}
if (!string.IsNullOrWhiteSpace(customffProbePath))
{
info.EncoderPath = customffProbePath;
}
return info;
}