diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-12-21 15:24:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 15:24:41 -0500 |
| commit | 9782f5665ca3d65a8c35aff911cedd49fa38709c (patch) | |
| tree | 6fc62453e0470c770c78a5e2679848eba6aa4378 /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | f54ed748376184b3d5f4100ad8c64cef732c226a (diff) | |
| parent | ef671725559ef394337343af510ecb557b700d17 (diff) | |
Merge pull request #2362 from MediaBrowser/beta
Beta
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -rw-r--r-- | MediaBrowser.Api/Playback/BaseStreamingService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs index 3718edba4..6545d995c 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -818,7 +818,7 @@ namespace MediaBrowser.Api.Playback if (state.VideoStream != null && state.VideoStream.Width.HasValue && state.VideoStream.Height.HasValue) { - videoSizeParam = string.Format(",scale={0}:{1}", state.VideoStream.Width.Value.ToString(UsCulture), state.VideoStream.Height.Value.ToString(UsCulture)); + videoSizeParam = string.Format("scale={0}:{1}", state.VideoStream.Width.Value.ToString(UsCulture), state.VideoStream.Height.Value.ToString(UsCulture)); } var mapPrefix = state.SubtitleStream.IsExternal ? @@ -829,7 +829,7 @@ namespace MediaBrowser.Api.Playback ? 0 : state.SubtitleStream.Index; - return string.Format(" -filter_complex \"[{0}:{1}]format=yuva444p{4},lut=u=128:v=128:y=gammaval(.3)[sub] ; [0:{2}] [sub] overlay{3}\"", + return string.Format(" -filter_complex \"[{0}:{1}]{4}[sub] ; [0:{2}] [sub] overlay{3}\"", mapPrefix.ToString(UsCulture), subtitleStreamIndex.ToString(UsCulture), state.VideoStream.Index.ToString(UsCulture), |