aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-03-10 13:34:33 -0500
committerGitHub <noreply@github.com>2017-03-10 13:34:33 -0500
commit3962361ad9940e0c8b2e6d4aea4fc6b1cdd88553 (patch)
tree7fea4368278baf8b34d0f6911031d9a81468d81f /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parenta9fdf940dc79a878df9aa4b345c83537ac4502e1 (diff)
parent79b28e2465b23b015694e67f665d0ff7671fdff5 (diff)
Merge pull request #2522 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 80b9cc154..ebcc9853a 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1670,6 +1670,11 @@ namespace MediaBrowser.Controller.MediaEncoding
case "h264":
if (_mediaEncoder.SupportsDecoder("h264_qsv"))
{
+ // qsv decoder does not support 10-bit input
+ if ((state.VideoStream.BitDepth ?? 8) > 8)
+ {
+ return null;
+ }
return "-c:v h264_qsv ";
}
break;