diff options
| author | PloughPuff <ploughpuff@protonmail.com> | 2019-02-08 13:35:26 +0000 |
|---|---|---|
| committer | Ploughpuff <ploughpuff@protonmail.com> | 2019-03-05 21:24:54 +0000 |
| commit | 20775116f76b12bf77672fa37c4ea5f82b69f157 (patch) | |
| tree | 1a48e91f9d890c9a623e3e0aa95ab95ff50e3d64 /MediaBrowser.Model/Configuration/EncodingOptions.cs | |
| parent | 5587dd8bfb93971f0a9a93006567f528c3530f50 (diff) | |
Reworked FFmpeg path discovery and always display to user
1) Reworked FFmpeg and FFprobe path discovery (CLI switch, Custom xml, system $PATH, UI update trigger). Removed FFMpeg folder from Emby.Server.Implementations. All path discovery now in MediaEncoder.
2) Always display FFmpeg path to user in Transcode page.
3) Allow user to remove a Custome FFmpeg path and return to using system $PATH (or --ffmpeg if available).
4) Remove unused code associated with 'prebuilt' FFmpeg.
5) Much improved logging during path discovery.
Diffstat (limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')
| -rw-r--r-- | MediaBrowser.Model/Configuration/EncodingOptions.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs index 8584bd3dd..ff697437a 100644 --- a/MediaBrowser.Model/Configuration/EncodingOptions.cs +++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs @@ -8,7 +8,8 @@ namespace MediaBrowser.Model.Configuration public bool EnableThrottling { get; set; } public int ThrottleDelaySeconds { get; set; } public string HardwareAccelerationType { get; set; } - public string EncoderAppPath { get; set; } + public string EncoderAppPathCustom { get; set; } // FFmpeg path as set by the user via the UI + public string EncoderAppPath { get; set; } // The current FFmpeg path being used by the system public string VaapiDevice { get; set; } public int H264Crf { get; set; } public string H264Preset { get; set; } |
