diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-08-19 16:28:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-19 16:28:43 -0400 |
| commit | 1bce9a89b6fe6b37cddfc13f6c8ed9bf570a76f5 (patch) | |
| tree | 7e3193614c5a132ae63034c2bb7e07956a5670e6 /MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs | |
| parent | d99278da1dcac4d3c60739e864597aa01f916636 (diff) | |
| parent | d95c04787cc4486f4ea5caaef20f6ac407a3f84a (diff) | |
Merge pull request #1433 from fhriley/h265
Add support for encoding with libx265 and hevc_nvenc
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs index 83a3f3e3c..c15681654 100644 --- a/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs +++ b/MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs @@ -77,7 +77,8 @@ namespace MediaBrowser.Api.Playback.Progressive { var videoCodec = state.VideoRequest.VideoCodec; - if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(videoCodec, "h264", StringComparison.OrdinalIgnoreCase) || + string.Equals(videoCodec, "h265", StringComparison.OrdinalIgnoreCase)) { return ".ts"; } |