3 files changed, 10 insertions, 7 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index ecf5d72d5..344eb9fbd 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -248,7 +248,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         protected virtual void DeleteFiles(EncodingJob job)
         {
-            File.Delete(job.OutputFilePath);
+            FileSystem.DeleteFile(job.OutputFilePath);
         }
 
         private void OnTranscodeBeginning(EncodingJob job)
@@ -280,13 +280,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
         private string GetOutputFilePath(EncodingJob state)
         {
-            var folder = ConfigurationManager.ApplicationPaths.TranscodingTempPath;
+            var folder = string.IsNullOrWhiteSpace(state.Options.OutputDirectory) ? 
+                ConfigurationManager.ApplicationPaths.TranscodingTempPath :
+                state.Options.OutputDirectory;
 
             var outputFileExtension = GetOutputFileExtension(state);
-            var context = state.Options.Context;
 
             var filename = state.Id + (outputFileExtension ?? string.Empty).ToLower();
-            return Path.Combine(folder, context.ToString().ToLower(), filename);
+            return Path.Combine(folder, filename);
         }
 
         protected virtual string GetOutputFileExtension(EncodingJob state)
@@ -460,7 +461,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             //    {
             //        if (SupportsThrottleWithStream)
             //        {
-            //            var url = "http://localhost:" + ServerConfigurationManager.Configuration.HttpServerPortNumber.ToString(UsCulture) + "/mediabrowser/videos/" + job.Request.Id + "/stream?static=true&Throttle=true&mediaSourceId=" + job.Request.MediaSourceId;
+            //            var url = "http://localhost:" + ServerConfigurationManager.Configuration.HttpServerPortNumber.ToString(UsCulture) + "/videos/" + job.Request.Id + "/stream?static=true&Throttle=true&mediaSourceId=" + job.Request.MediaSourceId;
 
             //            url += "&transcodingJobId=" + transcodingJobId;
 
@@ -1014,7 +1015,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
                 if (!string.IsNullOrEmpty(state.SubtitleStream.Language))
                 {
-                    var charenc = SubtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath, state.SubtitleStream.Language);
+                    var charenc = SubtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath);
 
                     if (!string.IsNullOrEmpty(charenc))
                     {
diff --git a/MediaBrowser.MediaEncoding/Encoder/JobLogger.cs b/MediaBrowser.MediaEncoding/Encoder/JobLogger.cs
index 6be870519..cb6e58f17 100644
--- a/MediaBrowser.MediaEncoding/Encoder/JobLogger.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/JobLogger.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Extensions;
+using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Globalization;
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index a4ab1c551..d631cab98 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -357,6 +357,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
                 }
             };
 
+            _logger.Debug("{0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);
+            
             await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
 
             process.Start();