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

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 7f1607217..ae714a84e 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -9,7 +9,7 @@ namespace MediaBrowser.Model.Configuration
         public string H264Encoder { get; set; }
         public bool EnableDebugLogging { get; set; }
         public bool EnableThrottling { get; set; }
-        public int ThrottleThresholdSeconds { get; set; }
+        public int ThrottleThresholdInSeconds { get; set; }
 
         public EncodingOptions()
         {
@@ -17,7 +17,7 @@ namespace MediaBrowser.Model.Configuration
             DownMixAudioBoost = 2;
             EncodingQuality = EncodingQuality.Auto;
             EnableThrottling = true;
-            ThrottleThresholdSeconds = 110;
+            ThrottleThresholdInSeconds = 120;
         }
     }
 }