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

fix: prefer cli ffmpeg path over config file (#11219)

Browse Source
This commit is contained in:
gnattu 2024-03-27 03:11:51 +08:00 committed by GitHub
parent d57508fe4c
commit e2e366f6d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,12 +154,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
/// </summary>
public void SetFFmpegPath()
{
// 1) Custom path stored in config/encoding xml file under tag <EncoderAppPath> takes precedence
var ffmpegPath = _configurationManager.GetEncodingOptions().EncoderAppPath;
// 1) Check if the --ffmpeg CLI switch has been given
var ffmpegPath = _startupOptionFFmpegPath;
if (string.IsNullOrEmpty(ffmpegPath))
{
// 2) Check if the --ffmpeg CLI switch has been given
ffmpegPath = _startupOptionFFmpegPath;
// 2) Custom path stored in config/encoding xml file under tag <EncoderAppPath> should be used as a fallback
ffmpegPath = _configurationManager.GetEncodingOptions().EncoderAppPath;
if (string.IsNullOrEmpty(ffmpegPath))
{
// 3) Check "ffmpeg"