diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2021-03-22 17:05:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-22 17:05:44 +0000 |
| commit | 5d16d1f66de499022da3eeb484a2cdfe341bed2f (patch) | |
| tree | ac348fc960f2c849d989a6d2f27a34a73d4f3675 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | 7fa525c83b7573e61124fa1c64a3b27569e66b6d (diff) | |
| parent | 0853d1265c99a2e8614aa0c7a584dff541484e19 (diff) | |
Merge branch 'master' into RemoteAccessFix
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index 8a25a64c7..47cf020b4 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -86,7 +86,7 @@ namespace MediaBrowser.MediaEncoding.Encoder _localization = localization; _encodingHelperFactory = encodingHelperFactory; _startupOptionFFmpegPath = config.GetValue<string>(Controller.Extensions.ConfigurationExtensions.FfmpegPathKey) ?? string.Empty; - _jsonSerializerOptions = JsonDefaults.GetOptions(); + _jsonSerializerOptions = JsonDefaults.Options; } /// <inheritdoc /> |