Merge pull request #1645 from vicpa/dev

qsv encode liveTV
2016-04-14 12:41:59 -04:00 · 2016-04-14 12:41:59 -04:00 · e34dc6701b
commit e34dc6701b
parent b0379ec7f8 67fbaa2433
1 changed files with 4 additions and 4 deletions
--- 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
                {