3 files changed, 2 insertions, 13 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;
         }
     }
 }
diff --git a/MediaBrowser.Model/Configuration/EncodingQuality.cs b/MediaBrowser.Model/Configuration/EncodingQuality.cs
deleted file mode 100644
index ba5a1f279..000000000
--- a/MediaBrowser.Model/Configuration/EncodingQuality.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-namespace MediaBrowser.Model.Configuration
-{
-    public enum EncodingQuality
-    {
-        Auto,
-        HighSpeed,
-        HighQuality,
-        MaxQuality
-    }
-}
-\ No newline at end of file
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 5c7caf407..19c5c833a 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -159,7 +159,6 @@
     <Compile Include="FileOrganization\TvFileOrganizationOptions.cs" />
     <Compile Include="Configuration\BaseApplicationConfiguration.cs" />
     <Compile Include="Configuration\DlnaOptions.cs" />
-    <Compile Include="Configuration\EncodingQuality.cs" />
     <Compile Include="Configuration\ImageOption.cs" />
     <Compile Include="Configuration\ImageSavingConvention.cs" />
     <Compile Include="LiveTv\LiveTvOptions.cs" />