aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Probing
diff options
context:
space:
mode:
authorDavid Ullmer <daullmer@gmail.com>2020-08-31 16:16:01 +0200
committerDavid Ullmer <daullmer@gmail.com>2020-08-31 16:16:01 +0200
commitb7c07f682152529a9993cd0fb9760ab668d4c930 (patch)
treea40f59efb5e6e612df47673359c1d20c72a78101 /MediaBrowser.MediaEncoding/Probing
parent9165dc3b3a94714da307079413f62326d5e585ef (diff)
parent4cc7406fe92b468f8a4257d7c40bf1e28f2a3404 (diff)
Merge branch 'master' into library-pictures
Diffstat (limited to 'MediaBrowser.MediaEncoding/Probing')
-rw-r--r--MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs1
1 files changed, 0 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs
index 8996d3b09..b7b23deff 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>