CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-03 22:40:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'master' into tonemap-overlay

Browse source
This commit is contained in:
Claus Vium 2021-08-30 20:02:31 +02:00 • committed by GitHub
commit ae031fdd28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
158 changed files with 2644 additions and 2112 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
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;