diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-10-26 13:21:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-26 13:21:48 +0000 |
| commit | 0b5ddc90ff8125b32e396b02a828b10b16a887c5 (patch) | |
| tree | fc511d6b1be5268ac38a2dd4414bdf57fe49de50 /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 1ee1f9c8a7d6f7a32d77d14351df040d5f3349fc (diff) | |
| parent | a814d01f8c6edab930877031cd9e323f9ceda9d0 (diff) | |
Merge branch 'master' into NetworkPR2
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index c7ec878d2..6cd0c70d2 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -342,7 +342,8 @@ namespace MediaBrowser.Controller.MediaEncoding { var size = new ImageDimensions(VideoStream.Width.Value, VideoStream.Height.Value); - var newSize = DrawingUtils.Resize(size, + var newSize = DrawingUtils.Resize( + size, BaseRequest.Width ?? 0, BaseRequest.Height ?? 0, BaseRequest.MaxWidth ?? 0, @@ -368,7 +369,8 @@ namespace MediaBrowser.Controller.MediaEncoding { var size = new ImageDimensions(VideoStream.Width.Value, VideoStream.Height.Value); - var newSize = DrawingUtils.Resize(size, + var newSize = DrawingUtils.Resize( + size, BaseRequest.Width ?? 0, BaseRequest.Height ?? 0, BaseRequest.MaxWidth ?? 0, |