Merge branch 'master' into usings

This commit is contained in:
Bond-009 authored and GitHub committed 2020-04-01 22:42:43 +02:00
commit f31efce52d
67 files changed
+538 -317

No files matched your search

@@ -429,7 +429,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
return new ProbeResultNormalizer(_logger, _fileSystem, _localization).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol);
return new ProbeResultNormalizer(_logger, _localization).GetMediaInfo(result, videoType, isAudio, primaryPath, protocol);
}
}