Merge branch 'master' into tonemap-overlay

This commit is contained in:
Claus Vium
2021-08-30 20:02:31 +02:00
committed by GitHub
158 changed files with 2644 additions and 2112 deletions

View File

@@ -12,8 +12,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
public class EncoderValidator
{
private const string DefaultEncoderPath = "ffmpeg";
private static readonly string[] _requiredDecoders = new[]
{
"h264",
@@ -124,7 +122,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
private readonly string _encoderPath;
public EncoderValidator(ILogger logger, string encoderPath = DefaultEncoderPath)
public EncoderValidator(ILogger logger, string encoderPath)
{
_logger = logger;
_encoderPath = encoderPath;