diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-13 11:25:23 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-13 11:25:23 -0500 |
| commit | 8c0e81efd99a350231f3daa68f1e1d6a98e2b772 (patch) | |
| tree | 7fb2398824d0f550985b0bbbfb523c33d1d556e3 | |
| parent | 798454c2e4be4efa4fe82cf0ec1ffeff3267f8aa (diff) | |
| parent | baeda1410a6d8e86bec083eb110cee0c3feb664c (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 017e8e346..a39e4cf58 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -439,7 +439,7 @@ namespace MediaBrowser.Api.Playback var maxWidthParam = request.MaxWidth.Value.ToString(UsCulture); return isH264Output ? - string.Format("{3} -vf \"{0}scale=min(iw\\,{1}):trunc(ow/a/2)*2{2}\"", maxWidthParam, assSubtitleParam, copyTsParam) : + string.Format("{3} -vf \"{0}scale=min(iw\\,{1}):trunc(ow/a/2)*2{2}\"",yadifParam, maxWidthParam, assSubtitleParam, copyTsParam) : string.Format("{3} -vf \"{0}scale=min(iw\\,{1}):-1{2}\"",yadifParam, maxWidthParam, assSubtitleParam, copyTsParam); } |