aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-04-03 01:31:45 -0400
committerLuke <luke.pulverenti@gmail.com>2016-04-03 01:31:45 -0400
commita1b9db336c813cb7c06e9f1a861dfbd8c30fb225 (patch)
tree8906d20a4f469b74b10bebab3e24b4c37d280b66 /MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
parentfc4876cfd2b921de06792bd1c9839bb54991f383 (diff)
parent6ba2a9ebd2cc42d83b8bbef959b8d5b71c0fee4d (diff)
Merge pull request #1622 from MediaBrowser/dev
update subtitle encoding
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
index 8c0a7b0b5..263efbb62 100644
--- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
@@ -969,7 +969,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (!string.IsNullOrEmpty(state.SubtitleStream.Language))
{
- var charenc = SubtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath, state.MediaSource.Protocol, CancellationToken.None).Result;
+ var charenc = SubtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath, state.SubtitleStream.Language, state.MediaSource.Protocol, CancellationToken.None).Result;
if (!string.IsNullOrEmpty(charenc))
{