diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-04-14 12:41:59 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-04-14 12:41:59 -0400 |
| commit | e34dc6701be6ba5a2354a3766ec124764f15c531 (patch) | |
| tree | 4e81ee46dd92c2bf28f9075057865c4ada9ad0ac | |
| parent | b0379ec7f8fb4804f76d64264a4b35b65debedc6 (diff) | |
| parent | 67fbaa2433264c2f6d7dc8e5a602050565bbe096 (diff) | |
Merge pull request #1645 from vicpa/dev
qsv encode liveTV
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index beca1b1a5d..901554973b 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -288,11 +288,9 @@ namespace MediaBrowser.Api.Playback { if (string.Equals(ApiEntryPoint.Instance.GetEncodingOptions().HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase)) { - // It's currently failing on live tv - if (state.RunTimeTicks.HasValue) - { + return "h264_qsv"; - } + } return "libx264"; @@ -440,6 +438,8 @@ namespace MediaBrowser.Api.Playback param += " -level " + state.VideoRequest.Level; break; } + + return param; } else { |