Merge pull request #2183 from MediaBrowser/dev

Dev

1 files changed, 0 insertions, 21 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index a2707aace..b2c2b71f8 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -108,11 +108,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             get
             {
-                if (_hasExternalEncoder)
-                {
-                    return "External";
-                }
-
                 if (string.IsNullOrWhiteSpace(FFMpegPath))
                 {
                     return null;
@@ -177,12 +172,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
         {
             ConfigureEncoderPaths();
 
-            if (_hasExternalEncoder)
-            {
-                LogPaths();
-                return;
-            }
-
             // If the path was passed in, save it into config now.
             var encodingOptions = GetEncodingOptions();
             var appPath = encodingOptions.EncoderAppPath;
@@ -207,11 +196,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         public async Task UpdateEncoderPath(string path, string pathType)
         {
-            if (_hasExternalEncoder)
-            {
-                return;
-            }
-
             Tuple<string, string> newPaths;
 
             if (string.Equals(pathType, "system", StringComparison.OrdinalIgnoreCase))
@@ -256,11 +240,6 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private void ConfigureEncoderPaths()
         {
-            if (_hasExternalEncoder)
-            {
-                return;
-            }
-
             var appPath = GetEncodingOptions().EncoderAppPath;
 
             if (string.IsNullOrWhiteSpace(appPath))