diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:33:10 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2015-12-28 22:33:10 -0500 |
| commit | 5d4682d4185c88332c460021c0ffea26361f291b (patch) | |
| tree | c50c075899778fb5e5caf6acbafe3cb95059adb8 /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | |
| parent | 2ed5c3d0e7f61534f7a01b8b200aff9115ddb444 (diff) | |
| parent | 50a16452a99ee5865082c73f2a4e063cb02f6e69 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs index afbd29578..9cdc4a7bf 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs @@ -505,7 +505,7 @@ namespace MediaBrowser.MediaEncoding.Encoder { return "libx264"; } - if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase) || string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase)) { return "libx265"; } |