diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-08-25 01:24:44 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 01:24:44 -0400 |
| commit | 168ae3a531e7b62788e152e8cbe0361d77be80d6 (patch) | |
| tree | 2258b303ab23db99fecdf9248993b6e62a138818 /MediaBrowser.MediaEncoding/Encoder | |
| parent | 4784b7cc0ebcdeca83f52c3eb9d3d4290b5a2745 (diff) | |
| parent | 29d0b21a789cc72c4858dfa3009a4d27ecb5691b (diff) | |
Merge pull request #2098 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs index aaa5593b4..6bf414dfa 100644 --- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs @@ -978,7 +978,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(max(iw/dar\\,ih)\\,{0})", maxHeightParam)); } } |