diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-16 00:04:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-16 00:04:49 -0400 |
| commit | d5a9db3af77b06a355558165a984328e35555279 (patch) | |
| tree | d365ab0727318f3fa763923713ddc36d1de7d231 /MediaBrowser.Controller | |
| parent | df084015e2021f655790fb2de973139caa6d4ff8 (diff) | |
| parent | e3531534b85aeaaa3e4aaf462d5e77ea142dc762 (diff) | |
Merge pull request #2825 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/Entities/BaseItem.cs | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Video.cs | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs index 8cc90db7d4..a6418418e1 100644 --- a/MediaBrowser.Controller/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1246,6 +1246,7 @@ namespace MediaBrowser.Controller.Entities /// Gets or sets the provider ids. /// </summary> /// <value>The provider ids.</value> + [IgnoreDataMember] public Dictionary<string, string> ProviderIds { get; set; } [IgnoreDataMember] diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs index fbeefbbd9c..3b166db922 100644 --- a/MediaBrowser.Controller/Entities/Video.cs +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -53,12 +53,6 @@ namespace MediaBrowser.Controller.Entities } } - /// <summary> - /// Gets or sets the display type of the media. - /// </summary> - /// <value>The display type of the media.</value> - public string DisplayMediaType { get; set; } - [IgnoreDataMember] public override bool SupportsPositionTicksResume { |