diff options
| author | BaronGreenback <jimcartlidge@yahoo.co.uk> | 2020-10-14 19:05:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-14 19:05:57 +0100 |
| commit | 5b8349b4426b2eaa5ac812bf86a89eb3febd2c40 (patch) | |
| tree | 893d00fddfdd52ba1ff69f56e3d2d5bce1bdb74a /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | a8cee0bd36278035135bf871f25c126a12fde9ef (diff) | |
| parent | d54de29485cc622a64c17884b39c9bc65e33af29 (diff) | |
Merge branch 'master' into fordiscussion
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index 68bc502a0..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, @@ -697,10 +699,12 @@ namespace MediaBrowser.Controller.MediaEncoding /// The progressive. /// </summary> Progressive, + /// <summary> /// The HLS. /// </summary> Hls, + /// <summary> /// The dash. /// </summary> |