Merge branch 'master' of https://github.com/MediaBrowser/Emby

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
+}