diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-09-29 08:58:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-29 08:58:53 -0400 |
| commit | b474b56c27a1dd4d5b4be3f8f2bc2c924c9ddce3 (patch) | |
| tree | c9d7e2f702cf899fb50348772b54538135a3a4f9 /MediaBrowser.MediaEncoding/Encoder | |
| parent | 26fe7402688b49c1d730d39bdb0ffd971da7da34 (diff) | |
| parent | 76c7bfcb6795771cb06ef354fbf76d6e39de8948 (diff) | |
Merge pull request #2199 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs index 490a51128..d3738d903 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs @@ -140,7 +140,7 @@ namespace MediaBrowser.MediaEncoding.Encoder { try { - await _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId, CancellationToken.None).ConfigureAwait(false); + await _mediaSourceManager.CloseLiveStream(MediaSource.LiveStreamId).ConfigureAwait(false); } catch (Exception ex) { |