diff options
| author | gnattu <gnattu@users.noreply.github.com> | 2024-03-27 03:11:51 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-26 13:11:51 -0600 |
| commit | e2e366f6d03e55c04e2bcce7235f26c956ff5232 (patch) | |
| tree | 981cac5138d448ef90b140dd8b03f8ce56aae91a /MediaBrowser.MediaEncoding | |
| parent | d57508fe4c59478df67a4f8494c2e522ae6d10ef (diff) | |
fix: prefer cli ffmpeg path over config file (#11219)
Diffstat (limited to 'MediaBrowser.MediaEncoding')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 8278015d6..3df444205 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -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" |