Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1221 from LogicalPhallacy/ffmpegdetection

Browse Source 
Make Jellyfin search its base dir for ffmpeg
This commit is contained in:
Joshua M. Boniface 2019-04-09 23:57:20 -04:00 committed by GitHub
commit 007fe34363
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -230,6 +230,11 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// <returns></returns> /// <returns></returns>
private string ExistsOnSystemPath(string filename) private string ExistsOnSystemPath(string filename)
{ {
string inJellyfinPath = GetEncoderPathFromDirectory(System.AppContext.BaseDirectory, filename);
if (!string.IsNullOrEmpty(inJellyfinPath))
{
return inJellyfinPath;
}
var values = Environment.GetEnvironmentVariable("PATH"); var values = Environment.GetEnvironmentVariable("PATH");
foreach (var path in values.Split(Path.PathSeparator)) foreach (var path in values.Split(Path.PathSeparator))