aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-12-24 15:06:52 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-26 09:25:13 -0500
commitfb3c69c61207e9f9fe87b515932a81228c4942d4 (patch)
treec28c1bd173230471e4d229c90f4d2785d2f14ae9 /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
parent07d0384e87d1b9d8c7b480b27705889b65f327ab (diff)
fixes #1310 - Downscaling 1280x720 to 720x404
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
index 692fe2b6a..afbd29578 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs
@@ -82,7 +82,10 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (state.OutputVideoBitrate.HasValue)
{
- var resolution = ResolutionNormalizer.Normalize(state.OutputVideoBitrate.Value,
+ var resolution = ResolutionNormalizer.Normalize(
+ state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
+ state.OutputVideoBitrate.Value,
+ state.VideoStream == null ? null : state.VideoStream.Codec,
state.OutputVideoCodec,
request.MaxWidth,
request.MaxHeight);