diff options
| author | Cody Robibero <cody@robibe.ro> | 2021-09-03 11:01:55 -0600 |
|---|---|---|
| committer | Cody Robibero <cody@robibe.ro> | 2021-09-03 11:01:55 -0600 |
| commit | ff9d14c8119f6cf77f21e4ebcc97c5580725b882 (patch) | |
| tree | 8ca7b09583a1195e507d347bcbddbabb039f47fc /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 88157fcc77dc6cd47b4defda95089677403241ba (diff) | |
| parent | 95ca1d54876e928dc654736ff5a279728c0f9ed0 (diff) | |
Merge remote-tracking branch 'upstream/master' into authenticationdb-efcore
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) |