diff options
| author | crobibero <cody@robibe.ro> | 2020-09-03 12:14:11 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-09-03 12:14:11 -0600 |
| commit | a523ff840c4f4a83800bca02280e5b0f7765658b (patch) | |
| tree | 5178a9806f056266ab3c28554ef4dc2fe46e255d /MediaBrowser.MediaEncoding/Probing | |
| parent | cb44f16068bb66db7e35e473530c0a85583c2511 (diff) | |
| parent | 645db0524fb1368135ecea9e5b776ad9b490b17b (diff) | |
Merge remote-tracking branch 'upstream/master' into output-formatters
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs index 8996d3b098..b7b23deff5 100644 --- a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs +++ b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs @@ -133,7 +133,6 @@ namespace MediaBrowser.MediaEncoding.Probing /// </summary> /// <value>The bits_per_raw_sample.</value> [JsonPropertyName("bits_per_raw_sample")] - [JsonConverter(typeof(JsonInt32Converter))] public int BitsPerRawSample { get; set; } /// <summary> |