diff options
| author | crobibero <cody@robibe.ro> | 2020-08-24 07:39:16 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-24 07:39:16 -0600 |
| commit | 9626101c9f8d0acceb2ecf97bed502c272d6e4f6 (patch) | |
| tree | 00d7edea6d98b2b36cd5487439ed15e4c9dcb491 /MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs | |
| parent | ef0a7c3e2a24519142c912837be4beefcd07e421 (diff) | |
| parent | 7ce21d436baa2ffe80e7723f3d0887db7a0eeaf1 (diff) | |
Merge remote-tracking branch 'upstream/master' into 3.1.7
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs index 174e74f34..6ebf7f159 100644 --- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs +++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS1591 + using System.IO; using System.Threading; using System.Threading.Tasks; @@ -12,7 +14,8 @@ namespace MediaBrowser.Controller.MediaEncoding /// Gets the subtitles. /// </summary> /// <returns>Task{Stream}.</returns> - Task<Stream> GetSubtitles(BaseItem item, + Task<Stream> GetSubtitles( + BaseItem item, string mediaSourceId, int subtitleStreamIndex, string outputFormat, @@ -25,6 +28,7 @@ namespace MediaBrowser.Controller.MediaEncoding /// Gets the subtitle language encoding parameter. /// </summary> /// <param name="path">The path.</param> + /// <param name="language">The language.</param> /// <param name="protocol">The protocol.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>System.String.</returns> |