diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-15 15:57:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-15 15:57:48 -0400 |
| commit | 8b20e507c566cf59df04dac93325495c4b9181bb (patch) | |
| tree | eff068746a86d59cffd1ddad35fd0cc4aef5f212 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 27fb3980017c67fa2ba7a394ec5fc0ef08d7b382 (diff) | |
| parent | ce1ed2bea7492a4e6c4dd26e1a8d73aa65a88236 (diff) | |
Merge pull request #2528 from MediaBrowser/dev
update hls to support mpeg2video
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 6482b6829..db23712ba 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -733,12 +733,18 @@ namespace MediaBrowser.Controller.MediaEncoding if (videoStream.IsInterlaced) { - return false; + if (request.DeInterlace) + { + return false; + } } if (videoStream.IsAnamorphic ?? false) { - return false; + if (request.RequireNonAnamorphic) + { + return false; + } } // Can't stream copy if we're burning in subtitles |