2 files changed, 9 insertions, 16 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 6d3894f02..77b894eb8 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -6,14 +6,13 @@ namespace MediaBrowser.Model.Configuration
         public int EncodingThreadCount { get; set; }
         public string TranscodingTempPath { get; set; }
         public double DownMixAudioBoost { get; set; }
-        public string H264Encoder { get; set; }
         public bool EnableDebugLogging { get; set; }
         public bool EnableThrottling { get; set; }
         public int ThrottleThresholdInSeconds { get; set; }
+        public string HardwareVideoDecoder { get; set; }
 
         public EncodingOptions()
         {
-            H264Encoder = "libx264";
             DownMixAudioBoost = 2;
             EnableThrottling = true;
             ThrottleThresholdInSeconds = 120;
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 9f95953cf..b137a8502 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -45,12 +45,6 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableHttps { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether [enable user specific user views].
-        /// </summary>
-        /// <value><c>true</c> if [enable user specific user views]; otherwise, <c>false</c>.</value>
-        public bool EnableUserSpecificUserViews { get; set; }
-
-        /// <summary>
         /// Gets or sets the value pointing to the file system where the ssl certiifcate is located..
         /// </summary>
         /// <value>The value pointing to the file system where the ssl certiifcate is located..</value>
@@ -103,6 +97,12 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [disable startup scan]; otherwise, <c>false</c>.</value>
         public bool DisableStartupScan { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable user views].
+        /// </summary>
+        /// <value><c>true</c> if [enable user views]; otherwise, <c>false</c>.</value>
+        public bool EnableUserViews { get; set; }
         
         /// <summary>
         /// Gets or sets a value indicating whether [enable library metadata sub folder].
@@ -222,8 +222,7 @@ namespace MediaBrowser.Model.Configuration
         public bool DisableXmlSavers { get; set; }
         public bool EnableWindowsShortcuts { get; set; }
 
-        public bool EnableVideoFrameAnalysis { get; set; }
-        public long VideoFrameAnalysisLimitBytes { get; set; }
+        public bool EnableVideoFrameByFrameAnalysis { get; set; }
         
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
@@ -273,16 +272,11 @@ namespace MediaBrowser.Model.Configuration
 
             PeopleMetadataOptions = new PeopleMetadataOptions();
 
-            EnableVideoFrameAnalysis = true;
-            VideoFrameAnalysisLimitBytes = 600000000;
+            EnableVideoFrameByFrameAnalysis = false;
 
             InsecureApps9 = new[]
             {
-                "Chromecast",
-                "iOS",
                 "Unknown app",
-                "iPad",
-                "iPhone",
                 "Windows Phone"
             };