diff options
| author | Luke <luke.pulverenti@gmail.com> | 2014-03-13 11:31:59 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2014-03-13 11:31:59 -0400 |
| commit | 64493dbbf4f5bfd03aee495b1a65a2d697571865 (patch) | |
| tree | bbcd633062316cc9585a39d4b13e9f9ee5d054fc /MediaBrowser.Server.Implementations/MediaEncoder | |
| parent | b7bcc2450694105de9f9fc8cc07d2cfc4d9d7c96 (diff) | |
| parent | 103ebca1256a4255d830450066235203f2579983 (diff) | |
Merge pull request #731 from timhobbs/master
Video player updates
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder')
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs index 25b9c687c..68e9e0c78 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs @@ -886,8 +886,10 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder var memoryStream = new MemoryStream(); +#pragma warning disable 4014 // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback process.StandardOutput.BaseStream.CopyToAsync(memoryStream); +#pragma warning restore 4014 // MUST read both stdout and stderr asynchronously or a deadlock may occurr process.BeginErrorReadLine(); |