aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvicpa <gtrapp@hotmail.com>2016-04-12 16:09:05 -0400
committervicpa <gtrapp@hotmail.com>2016-04-12 16:09:05 -0400
commit67fbaa2433264c2f6d7dc8e5a602050565bbe096 (patch)
treea3b62c79b3445c366c862d88078d93a3289de00c
parent6f82815a5de2e47502ab3ed3f3f116a5c898db31 (diff)
qsv endcode
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index beca1b1a5..901554973 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
{