diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-05 23:03:08 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-10-05 23:03:08 -0400 |
| commit | 863f123f3c8d26dc9fee050a9132857281caba84 (patch) | |
| tree | 7e3f3ea0b6d420c33bf79ba9c2b2e0ef480f408f /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | 3fbf08b8825d7476e7cd87fb922e3aa9245253cc (diff) | |
updated nuget + subtitle changes
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 6491b2527..93b26e387 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -286,8 +286,8 @@ namespace MediaBrowser.Api.Playback if (request.Height.HasValue) { return isH264Output ? - string.Format(" -vf \"scale={0}:trunc(oh/a/2)*2{1}\"", request.Height.Value, assSubtitleParam) : - string.Format(" -vf \"scale=-1{1}:{0}\"", request.Height.Value, assSubtitleParam); + string.Format(" -vf \"scale=trunc(oh*a*2)/2:{0}{1}\"", request.Height.Value, assSubtitleParam) : + string.Format(" -vf \"scale=-1:{0}{1}\"", request.Height.Value, assSubtitleParam); } // If a max width was requested @@ -302,8 +302,8 @@ namespace MediaBrowser.Api.Playback if (request.MaxHeight.HasValue && (!request.MaxWidth.HasValue || state.VideoStream == null)) { return isH264Output ? - string.Format(" -vf \"scale=min(ih\\,{0}):trunc(oh/a/2)*2{1}\"", request.MaxHeight.Value, assSubtitleParam) : - string.Format(" -vf \"scale=min(ih\\,{0}):-1{1}\"", request.MaxHeight.Value, assSubtitleParam); + string.Format(" -vf \"scale=trunc(oh*a*2)/2:min(ih\\,{0}){1}\"", request.MaxHeight.Value, assSubtitleParam) : + string.Format(" -vf \"scale=-1:min(ih\\,{0}){1}\"", request.MaxHeight.Value, assSubtitleParam); } if (state.VideoStream == null) |