aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/System
diff options
context:
space:
mode:
authorCody Robibero <cody@robibe.ro>2021-09-03 06:56:45 -0600
committerCody Robibero <cody@robibe.ro>2021-09-03 06:56:45 -0600
commitec1341215518d8975acafdf6a59644e63ad81a1a (patch)
tree50806c436134adae258e2053e03cb0d09556e4de /MediaBrowser.Model/System
parentecb4b8e0aacef56331e7eadd1f82839b0f6e1e00 (diff)
parentb1e7cfd84c6007472f3b42d6aea360a02119925a (diff)
Merge remote-tracking branch 'upstream/master' into warn-259810
Diffstat (limited to 'MediaBrowser.Model/System')
-rw-r--r--MediaBrowser.Model/System/SystemInfo.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index e45b2f33a6..a82c1c8c0c 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -133,6 +133,7 @@ namespace MediaBrowser.Model.System
[Obsolete("This should be handled by the package manager")]
public bool HasUpdateAvailable { get; set; }
+ [Obsolete("This isn't set correctly anymore")]
public FFmpegLocation EncoderLocation { get; set; }
public Architecture SystemArchitecture { get; set; }