aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-03-04 14:31:14 -0500
committerGitHub <noreply@github.com>2017-03-04 14:31:14 -0500
commitc6aaebc23294143887c59a0bd3fd964bb9c33829 (patch)
treecdd5fac00812712b20eefb388f01e28782996529
parentc811d57bca4e837707acd8483029fb643d56ad1b (diff)
parentc70dfc713b9c3df1b5f1c5992d98eaa0f5a95f8d (diff)
Merge pull request #2507 from gerrit507/dev
Add hevc hw-decoders and encoders to var required
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs7
1 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
index b37e783b8..9c1189f6c 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncoderValidator.cs
@@ -90,6 +90,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
var required = new[]
{
"h264_qsv",
+ "hevc_qsv",
"mpeg2_qsv",
"vc1_qsv"
};
@@ -134,9 +135,13 @@ namespace MediaBrowser.MediaEncoding.Encoder
"libvorbis",
"srt",
"h264_nvenc",
+ "hevc_nvenc",
"h264_qsv",
+ "hevc_qsv",
"h264_omx",
+ "hevc_omx",
"h264_vaapi",
+ "hevc_vaapi",
"ac3"
};
@@ -205,4 +210,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
}
}
-} \ No newline at end of file
+}