diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-03-29 02:27:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 02:27:52 -0400 |
| commit | cae9dfc1c990b6fc769f3a79c4bfe9122c3b256a (patch) | |
| tree | 34d6c2fcf7da3d9b5e098328b0c79073947a9fe9 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 9f9e81089f5606e958bc8c3f0e4d73475d02372a (diff) | |
| parent | f6b94af438da8f8d3b3760c3e67eb24b09bafbfd (diff) | |
Merge pull request #2555 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index b7b31509c..530ff1343 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1713,13 +1713,13 @@ namespace MediaBrowser.Controller.MediaEncoding return "-c:v h264_qsv "; } break; - //case "hevc": - //case "h265": - // if (_mediaEncoder.SupportsDecoder("hevc_qsv")) - // { - // return "-c:v hevc_qsv "; - // } - // break; + case "hevc": + case "h265": + if (_mediaEncoder.SupportsDecoder("hevc_qsv")) + { + return "-c:v hevc_qsv "; + } + break; case "mpeg2video": if (_mediaEncoder.SupportsDecoder("mpeg2_qsv")) { |