diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-08 22:12:17 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-04-08 22:12:17 -0400 |
| commit | d1a9d42eaf486b84e7d77ace69a9607fca76c317 (patch) | |
| tree | 9d7d7c22ebd83062cca6a6e9ef368e5631b7c717 /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | 389d0ec7fdb05259a2b808b6733a1977f482268c (diff) | |
update translations
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 11 |
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"; //} |
