diff options
| author | Tim Hobbs <jesus.tesh@gmail.com> | 2014-04-18 00:56:43 -0700 |
|---|---|---|
| committer | Tim Hobbs <jesus.tesh@gmail.com> | 2014-04-18 00:56:43 -0700 |
| commit | 1da36ba59d7449c0f6bf3bb83456fe0ac47a56b2 (patch) | |
| tree | bd3bbd9cfb3a66045a5ffc9d9dda3a8c8425a4a4 /MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | |
| parent | 3c11988f08c12a35cd2074eb7c5afa6fdaaa04f7 (diff) | |
| parent | b7b6f64f0089d7ce4ff8c3c5682fd8ede7311b1b (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs index cdd9df49b..a7fde61f8 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs @@ -224,7 +224,7 @@ namespace MediaBrowser.MediaEncoding.Encoder case EncodingQuality.HighSpeed: return 2; case EncodingQuality.HighQuality: - return isWebm ? Math.Max((int)((Environment.ProcessorCount -1) / 2) , 2) : 0; + return 2; case EncodingQuality.MaxQuality: return isWebm ? Math.Max(Environment.ProcessorCount - 1, 2) : 0; default: |