aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2015-07-10 22:30:36 -0400
committerLuke <luke.pulverenti@gmail.com>2015-07-10 22:30:36 -0400
commit63f9abd4d65b7b7fd43f7ec7faf510075285ed69 (patch)
tree9cba4db7741db461cd7995d39d30d70483f7ae6d /MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
parentffe60d453d2610db290bff0a3319dbe7c0ceba04 (diff)
parentfe7fd7cd266be0fe8c0cc2be095cc0b267931ea9 (diff)
Merge pull request #1127 from MediaBrowser/dev
3.0.5641.5
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index 16b4e418e..97c5aecd0 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -834,7 +834,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
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
@@ -850,7 +850,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
{
var maxHeightParam = request.MaxHeight.Value.ToString(UsCulture);
- filters.Add(string.Format("scale=trunc(oh*a*2)/2:min(ih\\,{0})", maxHeightParam));
+ filters.Add(string.Format("scale=trunc(oh*a/2)*2:min(ih\\,{0})", maxHeightParam));
}
var output = string.Empty;