OpenSource/jellyfin
1
0 Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-11-05 21:55:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync updates

Browse Source
This commit is contained in:
Luke Pulverenti committed 2015-03-31 12:24:16 -04:00
1 parent eaf70589ae
commit a025f4eefa
24 files changed
+366 -133
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
+1 -1
View File
@@ -951,7 +951,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
if (!string.IsNullOrEmpty(state.SubtitleStream.Language))
{
var charenc = SubtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath);
var charenc = SubtitleEncoder.GetSubtitleFileCharacterSet(subtitlePath, state.MediaSource.Protocol, CancellationToken.None).Result;
if (!string.IsNullOrEmpty(charenc))
{