Merge branch 'dev' into imagesize

This commit is contained in:
Andrew Rabert
2019-01-20 20:45:06 -05:00
committed by GitHub
204 changed files with 1286 additions and 12832 deletions

View File

@@ -51,15 +51,15 @@ namespace Emby.Drawing
private readonly Func<IMediaEncoder> _mediaEncoder;
public ImageProcessor(
ILogger logger,
ILoggerFactory loggerFactory,
IServerApplicationPaths appPaths,
IFileSystem fileSystem,
IImageEncoder imageEncoder,
Func<ILibraryManager> libraryManager,
Func<IMediaEncoder> mediaEncoder)
{
_logger = logger;
_appPaths = appPaths;
_logger = loggerFactory.CreateLogger(nameof(ImageProcessor));
_fileSystem = fileSystem;
_imageEncoder = imageEncoder;
_libraryManager = libraryManager;