mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-06 05:43:03 +02:00
Merge pull request #6589 from Bond-009/ffmpeg3
This commit is contained in:
commit
46701e16b5
|
@ -165,14 +165,22 @@ namespace MediaBrowser.MediaEncoding.Encoder
|
|||
// User had cleared the custom path in UI
|
||||
newPath = string.Empty;
|
||||
}
|
||||
else if (Directory.Exists(path))
|
||||
{
|
||||
// Given path is directory, so resolve down to filename
|
||||
newPath = GetEncoderPathFromDirectory(path, "ffmpeg");
|
||||
}
|
||||
else
|
||||
{
|
||||
newPath = path;
|
||||
if (Directory.Exists(path))
|
||||
{
|
||||
// Given path is directory, so resolve down to filename
|
||||
newPath = GetEncoderPathFromDirectory(path, "ffmpeg");
|
||||
}
|
||||
else
|
||||
{
|
||||
newPath = path;
|
||||
}
|
||||
|
||||
if (!new EncoderValidator(_logger, newPath).ValidateVersion())
|
||||
{
|
||||
throw new ResourceNotFoundException();
|
||||
}
|
||||
}
|
||||
|
||||
// Write the new ffmpeg path to the xml as <EncoderAppPath>
|
||||
|
|
Loading…
Reference in a new issue