diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-04 02:06:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-04 02:06:36 -0400 |
| commit | 26c1a8c017c249dc0918e09b7e46269a57232667 (patch) | |
| tree | ab2790c5e2bd7c888d4cb3bd2d7556f7d5b16bfc /MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs | |
| parent | c4a9dd3d262c880b8499e2f9b564d9ead99a7a22 (diff) | |
| parent | cf47dd04140745f6790f980064e0039d1ff8fd61 (diff) | |
Merge pull request #2563 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs index 883709de8..98adb6e20 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs @@ -38,7 +38,6 @@ namespace MediaBrowser.MediaEncoding.Encoder public bool EstimateContentLength { get; set; } public TranscodeSeekInfo TranscodeSeekInfo { get; set; } public long? EncodingDurationTicks { get; set; } - public string LiveStreamId { get; set; } public string ItemType { get; set; } @@ -94,7 +93,7 @@ namespace MediaBrowser.MediaEncoding.Encoder private async void DisposeLiveStream() { - if (MediaSource.RequiresClosing) + if (MediaSource.RequiresClosing && string.IsNullOrWhiteSpace(Options.LiveStreamId) && !string.IsNullOrWhiteSpace(MediaSource.LiveStreamId)) { try { |