aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-27 12:59:10 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-27 12:59:10 -0500
commit69ce0cd5b52f99e4eca0304b546c88791a1debc2 (patch)
tree4760f8d4d5372b1a683fcbb0183d9503d4a30a39
parentc4094ca0989a27ebb132ff7aa9565ef1a4c04ab5 (diff)
fix scaling
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index fcdd01c73..9eb0f7d45 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -547,7 +547,7 @@ namespace MediaBrowser.Api.Playback
{
var heightParam = request.Height.Value.ToString(UsCulture);
- filters.Add(string.Format("scale=trunc(oh*a*2)/2:{0}", heightParam));
+ filters.Add(string.Format("scale=trunc(oh*a/2)*2:{0}", heightParam));
}
// If a max width was requested
@@ -555,7 +555,7 @@ namespace MediaBrowser.Api.Playback
{
var maxWidthParam = request.MaxWidth.Value.ToString(UsCulture);
- filters.Add(string.Format("scale=min(iw\\,{0}):trunc(ow/dar/2)*2", maxWidthParam));
+ filters.Add(string.Format("scale=trunc(min(max(iw\\,ih*dar)\\,{0})/2)*2:trunc(ow/dar/2)*2", maxWidthParam));
}
// If a max height was requested