diff options
| author | crobibero <cody@robibe.ro> | 2020-10-27 13:25:57 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-10-27 13:25:57 -0600 |
| commit | 4558c192c76e153d752a1aacdd965525430023b5 (patch) | |
| tree | dfb7a5d479f82db7a99eae57722599530d8504ad /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 163d6b0f1d1a252e85b8776b4b0c2ccaa611667e (diff) | |
| parent | be2f27a0695e5f3102f79a2e246e971682cff603 (diff) | |
Merge remote-tracking branch 'upstream/master' into query-image-type
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, |