2 files changed, 6 insertions, 8 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index e086f9d33..d8d0a1aa3 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -424,11 +424,9 @@ namespace MediaBrowser.Controller.MediaEncoding
                     if (state.VideoStream != null && state.VideoStream.Width.HasValue)
                     {
                         // This is hacky but not sure how to get the exact subtitle resolution
-                        double height = state.VideoStream.Width.Value;
-                        height /= 16;
-                        height *= 9;
+                        int height = Convert.ToInt32((double)state.VideoStream.Width.Value / 16.0 * 9.0);
 
-                        arg += string.Format(" -canvas_size {0}:{1}", state.VideoStream.Width.Value.ToString(CultureInfo.InvariantCulture), Convert.ToInt32(height).ToString(CultureInfo.InvariantCulture));
+                        arg += string.Format(" -canvas_size {0}:{1}", state.VideoStream.Width.Value.ToString(CultureInfo.InvariantCulture), height.ToString(CultureInfo.InvariantCulture));
                     }
 
                     var subtitlePath = state.SubtitleStream.Path;
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 6651a6d70..1fe8856cc 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -319,7 +319,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 if (VideoStream != null && VideoStream.Width.HasValue && VideoStream.Height.HasValue)
                 {
-                    var size = new ImageSize
+                    var size = new ImageDimensions
                     {
                         Width = VideoStream.Width.Value,
                         Height = VideoStream.Height.Value
@@ -331,7 +331,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                         BaseRequest.MaxWidth ?? 0,
                         BaseRequest.MaxHeight ?? 0);
 
-                    return Convert.ToInt32(newSize.Width);
+                    return newSize.Width;
                 }
 
                 if (!IsVideoRequest)
@@ -349,7 +349,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 if (VideoStream != null && VideoStream.Width.HasValue && VideoStream.Height.HasValue)
                 {
-                    var size = new ImageSize
+                    var size = new ImageDimensions
                     {
                         Width = VideoStream.Width.Value,
                         Height = VideoStream.Height.Value
@@ -361,7 +361,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                         BaseRequest.MaxWidth ?? 0,
                         BaseRequest.MaxHeight ?? 0);
 
-                    return Convert.ToInt32(newSize.Height);
+                    return newSize.Height;
                 }
 
                 if (!IsVideoRequest)