Merge pull request #1222 from MediaBrowser/dev

3.0.5768.7

1 files changed, 1 insertions, 2 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;