diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-17 16:33:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-17 16:33:52 -0400 |
| commit | f0f3ca8c181b4144cbd21fb545d0629e92a9529b (patch) | |
| tree | ebf4e2680ef00483b38618d97e7df26ea3da2fcd /MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | |
| parent | 315541a686858eeab84f73a4fcad1a11c1ee15c7 (diff) | |
| parent | 6a66aef608a0caa567f603edbd9a4e3466fda469 (diff) | |
Merge pull request #2584 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs index c0440e132..e402c2bac 100644 --- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs @@ -356,7 +356,7 @@ namespace MediaBrowser.MediaEncoding.Encoder { OpenToken = state.MediaSource.OpenToken - }, false, cancellationToken).ConfigureAwait(false); + }, cancellationToken).ConfigureAwait(false); EncodingHelper.AttachMediaSourceInfo(state, liveStreamResponse.MediaSource, null); |