mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-26 07:28:43 +02:00
Merge pull request #6589 from Bond-009/ffmpeg3
This commit is contained in:
commit
46701e16b5
|
@ -165,7 +165,9 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
// User had cleared the custom path in UI
|
// User had cleared the custom path in UI
|
||||||
newPath = string.Empty;
|
newPath = string.Empty;
|
||||||
}
|
}
|
||||||
else if (Directory.Exists(path))
|
else
|
||||||
|
{
|
||||||
|
if (Directory.Exists(path))
|
||||||
{
|
{
|
||||||
// Given path is directory, so resolve down to filename
|
// Given path is directory, so resolve down to filename
|
||||||
newPath = GetEncoderPathFromDirectory(path, "ffmpeg");
|
newPath = GetEncoderPathFromDirectory(path, "ffmpeg");
|
||||||
|
@ -175,6 +177,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
||||||
newPath = path;
|
newPath = path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!new EncoderValidator(_logger, newPath).ValidateVersion())
|
||||||
|
{
|
||||||
|
throw new ResourceNotFoundException();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Write the new ffmpeg path to the xml as <EncoderAppPath>
|
// Write the new ffmpeg path to the xml as <EncoderAppPath>
|
||||||
// This ensures its not lost on next startup
|
// This ensures its not lost on next startup
|
||||||
var config = _configurationManager.GetEncodingOptions();
|
var config = _configurationManager.GetEncodingOptions();
|
||||||
|
|
Loading…
Reference in a new issue