CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-31 17:41:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

sync updates

Browse source
This commit is contained in:
Luke Pulverenti 2015-03-31 12:24:16 -04:00
parent eaf70589ae
commit a025f4eefa
24 changed files with 366 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

8
MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
View file

@ -1,4 +1,5 @@
using System.IO;
using MediaBrowser.Model.MediaInfo;
using System.IO;
using System.Threading;
using System.Threading.Tasks;
@ -47,8 +48,9 @@ namespace MediaBrowser.Controller.MediaEncoding
/// Gets the subtitle language encoding parameter.
/// </summary>
/// <param name="path">The path.</param>
/// <param name="protocol">The protocol.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>System.String.</returns>
string GetSubtitleFileCharacterSet(string path);
Task<string> GetSubtitleFileCharacterSet(string path, MediaProtocol protocol, CancellationToken cancellationToken);
}
}