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

Restore original flag behaviour

Browse Source
This commit is contained in:
Joshua M. Boniface 2023-11-23 13:24:56 -05:00
parent 0430ffecb6
commit bf5f00a383
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,13 +117,18 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// </summary> /// </summary>
public void SetFFmpegPath() public void SetFFmpegPath()
{ {
// 1) Check if the --ffmpeg CLI switch has been given // 1) Custom path stored in config/encoding xml file under tag <EncoderAppPath> takes precedence
var ffmpegPath = _startupOptionFFmpegPath; var ffmpegPath = _configurationManager.GetEncodingOptions().EncoderAppPath;
if (string.IsNullOrEmpty(ffmpegPath)) if (string.IsNullOrEmpty(ffmpegPath))
{ {
// 2) Check "ffmpeg" // 2) Check if the --ffmpeg CLI switch has been given
ffmpegPath = _startupOptionFFmpegPath;
if (string.IsNullOrEmpty(ffmpegPath))
{
// 3) Check "ffmpeg"
ffmpegPath = "ffmpeg"; ffmpegPath = "ffmpeg";
} }
}
if (!ValidatePath(ffmpegPath)) if (!ValidatePath(ffmpegPath))
{ {