diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-20 16:18:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-20 16:18:18 -0400 |
| commit | 389baf67b68f10052f5cd870a8a9e59adcbdadeb (patch) | |
| tree | 0905e58cd5ac77c349c5df04c4c6b936f052d9a2 /Emby.Server.Implementations/LiveTv | |
| parent | 3cd37ed3c77b94cb76992f9a29c99cd3f285bb75 (diff) | |
| parent | 7ea3719a2dfbdbe18a6b83ea5532f061c238cbc4 (diff) | |
Merge pull request #2589 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvManager.cs | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs index 4efef4470..925dec71c 100644 --- a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs +++ b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs @@ -30,8 +30,6 @@ namespace Emby.Server.Implementations.LiveTv var now = DateTime.UtcNow; - var allowVideoStreamCopy = mediaSource.MediaStreams.Any(i => i.Type == MediaStreamType.Video && i.AllowStreamCopy); - var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest { InputPath = mediaSource.Path, @@ -76,8 +74,6 @@ namespace Emby.Server.Implementations.LiveTv var videoStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaBrowser.Model.Entities.MediaStreamType.Video); if (videoStream != null) { - videoStream.AllowStreamCopy = allowVideoStreamCopy; - if (!videoStream.BitRate.HasValue) { var width = videoStream.Width ?? 1920; diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs index eee4a2725..a898d3084 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs @@ -490,7 +490,6 @@ namespace Emby.Server.Implementations.LiveTv if (stream.Type == MediaStreamType.Video) { stream.IsInterlaced = true; - stream.AllowStreamCopy = false; } } } |