|
@@ -117,17 +117,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|
/// </summary>
|
|
/// </summary>
|
|
public void SetFFmpegPath()
|
|
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))
|
|
if (string.IsNullOrEmpty(ffmpegPath))
|
|
{
|
|
{
|
|
- // 2) Check if the --ffmpeg CLI switch has been given
|
|
|
|
- ffmpegPath = _startupOptionFFmpegPath;
|
|
|
|
- if (string.IsNullOrEmpty(ffmpegPath))
|
|
|
|
- {
|
|
|
|
- // 3) Check "ffmpeg"
|
|
|
|
- ffmpegPath = "ffmpeg";
|
|
|
|
- }
|
|
|
|
|
|
+ // 2) Check "ffmpeg"
|
|
|
|
+ ffmpegPath = "ffmpeg";
|
|
}
|
|
}
|
|
|
|
|
|
if (!ValidatePath(ffmpegPath))
|
|
if (!ValidatePath(ffmpegPath))
|