diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-04-04 22:27:27 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-04-04 22:27:27 -0700 |
| commit | ddf464720e879ff2fa75a843bbb362651c5ef2a7 (patch) | |
| tree | f435395fec9448d44aba16b8ee690e86252db8d2 /MediaBrowser.Api/Playback/BaseStreamingService.cs | |
| parent | be710018c5718c6b16022bb6b29b1e3f8b350b62 (diff) | |
| parent | 2d7c0ab29c76392d5d8f6b72d27194ee38218643 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts:
MediaBrowser.WebDashboard/dashboard-ui/scripts/boxset.js
Diffstat (limited to 'MediaBrowser.Api/Playback/BaseStreamingService.cs')
| -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 9a264a7ba..6c12452fc 100644 --- a/MediaBrowser.Api/Playback/BaseStreamingService.cs +++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs @@ -362,7 +362,7 @@ namespace MediaBrowser.Api.Playback outputSizeParam = "," + outputSizeParam.Substring(outputSizeParam.IndexOf("scale", StringComparison.OrdinalIgnoreCase)); } - return string.Format(" -filter_complex \"[0:{0}]format=yuva444p,lut=u=128:v=128:y=gammaval(.3)[sub] ; [0:0] [sub] overlay{1}\"", state.SubtitleStream.Index, outputSizeParam); + return string.Format(" -filter_complex \"[0:{0}]format=yuva444p,lut=u=128:v=128:y=gammaval(.3)[sub] ; [0:{1}] [sub] overlay{2}\"", state.SubtitleStream.Index, state.VideoStream.Index, outputSizeParam); } /// <summary> |