Merge pull request #1164 from MediaBrowser/dev

3.0.5724.1

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index ae714a84e..6d3894f02 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -3,7 +3,7 @@ namespace MediaBrowser.Model.Configuration
 {
     public class EncodingOptions
     {
-        public EncodingQuality EncodingQuality { get; set; }
+        public int EncodingThreadCount { get; set; }
         public string TranscodingTempPath { get; set; }
         public double DownMixAudioBoost { get; set; }
         public string H264Encoder { get; set; }
@@ -15,9 +15,9 @@ namespace MediaBrowser.Model.Configuration
         {
             H264Encoder = "libx264";
             DownMixAudioBoost = 2;
-            EncodingQuality = EncodingQuality.Auto;
             EnableThrottling = true;
             ThrottleThresholdInSeconds = 120;
+            EncodingThreadCount = -1;
         }
     }
 }