diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-04-01 15:51:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-01 15:51:15 -0400 |
| commit | b3640fbc9a0f7fd4a1def4e3c2f8860feb0f6922 (patch) | |
| tree | 7101480819120755d5916a1da9d48a2479aa9eb5 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 2b7c33e61727a62805c8f15f8dbace658985c002 (diff) | |
| parent | d4d6314c5ac4515ad8ddf7c8636245ed2d93d4c8 (diff) | |
Merge pull request #2561 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 996009524..36f0f67bd 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1741,13 +1741,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")) { |