Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 7 deletions

diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index 9787a7cd0..bb55b893a 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -919,7 +919,7 @@ namespace MediaBrowser.Api.Playback
             var commandLineLogMessage = process.StartInfo.FileName + " " + process.StartInfo.Arguments;
             Logger.Info(commandLineLogMessage);
 
-            var logFilePath = Path.Combine(ServerConfigurationManager.ApplicationPaths.LogDirectoryPath, "ffmpeg-" + Guid.NewGuid() + ".txt");
+            var logFilePath = Path.Combine(ServerConfigurationManager.ApplicationPaths.LogDirectoryPath, "transcode-" + Guid.NewGuid() + ".txt");
             Directory.CreateDirectory(Path.GetDirectoryName(logFilePath));
 
             // FFMpeg writes debug/error info to stderr. This is useful when debugging so let's put it in the log directory.
@@ -1485,17 +1485,14 @@ namespace MediaBrowser.Api.Playback
 
             ApplyDeviceProfileSettings(state);
 
-            if (videoRequest != null && state.VideoStream != null)
+            if (videoRequest != null)
             {
-                if (CanStreamCopyVideo(videoRequest, state.VideoStream, state.VideoType))
+                if (state.VideoStream != null && CanStreamCopyVideo(videoRequest, state.VideoStream, state.VideoType))
                 {
                     videoRequest.VideoCodec = "copy";
                 }
-            }
 
-            if (state.AudioStream != null)
-            {
-                //if (CanStreamCopyAudio(request, state.AudioStream))
+                //if (state.AudioStream != null && CanStreamCopyAudio(request, state.AudioStream))
                 //{
                 //    request.AudioCodec = "copy";
                 //}