Merge branch 'dev' of https://github.com/MediaBrowser/MediaBrowser into dev

1 files changed, 6 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 07d5905c6..9f95953cf 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -222,11 +222,13 @@ namespace MediaBrowser.Model.Configuration
         public bool DisableXmlSavers { get; set; }
         public bool EnableWindowsShortcuts { get; set; }
 
+        public bool EnableVideoFrameAnalysis { get; set; }
+        public long VideoFrameAnalysisLimitBytes { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
         public ServerConfiguration()
-            : base()
         {
             ImageSavingConvention = ImageSavingConvention.Compatible;
             PublicPort = 8096;
@@ -271,6 +273,9 @@ namespace MediaBrowser.Model.Configuration
 
             PeopleMetadataOptions = new PeopleMetadataOptions();
 
+            EnableVideoFrameAnalysis = true;
+            VideoFrameAnalysisLimitBytes = 600000000;
+
             InsecureApps9 = new[]
             {
                 "Chromecast",