diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2023-02-02 13:05:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-02 13:05:02 +0100 |
| commit | 9e155eacea11f959a2531a04fc9089be92e65def (patch) | |
| tree | 302ee5bf7d4f5d6818f07b7a6cfdfde5f7890bb6 /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | |
| parent | fe48c47e292a531c82120d083984620ce011a480 (diff) | |
| parent | 65d605b17dfc978ebc089b7500a5aacd8fcd863f (diff) | |
Merge pull request #9227 from Bond-009/ffprobe
Improve ffprobe json parsing and don't log error for Codec Type attachment
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs index d2240b5af..cef02d5f8 100644 --- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs @@ -12,6 +12,7 @@ using System.Text.RegularExpressions; using System.Threading; using System.Threading.Tasks; using Jellyfin.Extensions.Json; +using Jellyfin.Extensions.Json.Converters; using MediaBrowser.Common; using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Extensions; @@ -105,7 +106,9 @@ namespace MediaBrowser.MediaEncoding.Encoder _config = config; _serverConfig = serverConfig; _startupOptionFFmpegPath = config.GetValue<string>(Controller.Extensions.ConfigurationExtensions.FfmpegPathKey) ?? string.Empty; - _jsonSerializerOptions = JsonDefaults.Options; + + _jsonSerializerOptions = new JsonSerializerOptions(JsonDefaults.Options); + _jsonSerializerOptions.Converters.Add(new JsonBoolStringConverter()); } /// <inheritdoc /> |
