aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
diff options
context:
space:
mode:
authorJoshua M. Boniface <joshua@boniface.me>2019-01-10 19:54:18 -0500
committerGitHub <noreply@github.com>2019-01-10 19:54:18 -0500
commit15c89d281e29578a752dd9828e12e6fa243621a8 (patch)
tree49ad7b46cb06c844affe835e5ed7b8d87deebf4a /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
parent3d867c2c46cec39b669bb8647efef677f32b8a8d (diff)
parentbd169e4fd4f5586ab8dad323a520cbcc10de54fe (diff)
Merge pull request #506 from hawken93/linting
Removing tabs and trailing whitespace
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs5
1 files changed, 3 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 4fb9a711e..a6c437e62 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -740,7 +740,7 @@ namespace MediaBrowser.Controller.MediaEncoding
level = NormalizeTranscodingLevel(state.OutputVideoCodec, level);
// h264_qsv and h264_nvenc expect levels to be expressed as a decimal. libx264 supports decimal and non-decimal format
- // also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307
+ // also needed for libx264 due to https://trac.ffmpeg.org/ticket/3307
if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase) ||
string.Equals(videoEncoder, "libx264", StringComparison.OrdinalIgnoreCase))
{
@@ -1706,7 +1706,8 @@ namespace MediaBrowser.Controller.MediaEncoding
if (string.Equals(outputVideoCodec, "libvpx", StringComparison.OrdinalIgnoreCase))
{
// per docs:
- // -threads number of threads to use for encoding, can't be 0 [auto] with VP8 (recommended value : number of real cores - 1)
+ // -threads number of threads to use for encoding, can't be 0 [auto] with VP8
+ // (recommended value : number of real cores - 1)
return Math.Max(Environment.ProcessorCount - 1, 1);
}