diff options
| author | cvium <clausvium@gmail.com> | 2021-09-03 21:33:41 +0200 |
|---|---|---|
| committer | cvium <clausvium@gmail.com> | 2021-09-03 21:33:41 +0200 |
| commit | 6b3ecf25337d230a680ed83623bf7a40224b4873 (patch) | |
| tree | 42a6a3b3b6fba787d7a67c91b4d91e04c5b1d01a /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 048c478b0d9fbad3c7e6ef7fcbf8e6c2b91fc013 (diff) | |
| parent | e229f6d9bb2df96bfe405a3b05e17000700e6806 (diff) | |
Merge branch 'master' into bug/authorization-header-issue
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index fa9f40d60..b09b7dba6 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -422,7 +422,7 @@ namespace MediaBrowser.Controller.MediaEncoding if (EncodingHelper.IsCopyCodec(OutputVideoCodec)) { - return VideoStream?.Codec; + return VideoStream.Codec; } return OutputVideoCodec; @@ -440,7 +440,7 @@ namespace MediaBrowser.Controller.MediaEncoding if (EncodingHelper.IsCopyCodec(OutputAudioCodec)) { - return AudioStream?.Codec; + return AudioStream.Codec; } return OutputAudioCodec; @@ -568,7 +568,7 @@ namespace MediaBrowser.Controller.MediaEncoding } } - return forceDeinterlaceIfSourceIsInterlaced && isInputInterlaced; + return forceDeinterlaceIfSourceIsInterlaced; } public string[] GetRequestedProfiles(string codec) |