diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2019-07-29 15:15:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-29 15:15:17 -0700 |
| commit | bf083c142921a91f017e3b82a671ebc202bf55ef (patch) | |
| tree | 53e8397bbc76418cc7b9d3e335e378355e19f1ea /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | 8c15ac7fab0febc3299dee0690f2197c388a719f (diff) | |
| parent | e6ef6088fffd8d532bd59c2bf2aca1f68cae2137 (diff) | |
Merge pull request #1579 from Bond-009/ass
Fix #1388 and #1472
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index 2984efec3..b9ccc93ef 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -573,7 +573,9 @@ namespace MediaBrowser.Controller.MediaEncoding } // TODO: Perhaps also use original_size=1920x800 ?? - return string.Format("subtitles=filename='{0}'{1}{2}{3}", + return string.Format( + CultureInfo.InvariantCulture, + "subtitles=filename='{0}'{1}{2}", _mediaEncoder.EscapeSubtitleFilterPath(subtitlePath), charsetParam, // fallbackFontParam, @@ -582,7 +584,9 @@ namespace MediaBrowser.Controller.MediaEncoding var mediaPath = state.MediaPath ?? string.Empty; - return string.Format("subtitles='{0}:si={1}'{2}", + return string.Format( + CultureInfo.InvariantCulture, + "subtitles='{0}:si={1}'{2}", _mediaEncoder.EscapeSubtitleFilterPath(mediaPath), state.InternalSubtitleStreamOffset.ToString(_usCulture), // fallbackFontParam, |
