aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller
diff options
context:
space:
mode:
authorEric Reed <ebr@mediabrowser3.com>2014-01-25 16:12:51 -0500
committerEric Reed <ebr@mediabrowser3.com>2014-01-25 16:12:51 -0500
commit19e73fc7e611b6a1c08298bbafcd7cab4d61e9e5 (patch)
treee5752768cfca1687feba1f25fd1a437e0e67839b /MediaBrowser.Controller
parent2c4c19cd9f7742fb292f18a5aaf6956cd5f6cd40 (diff)
parentd69f3a00af79fab446c46682aa462e3b10bf39f8 (diff)
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Controller')
-rw-r--r--MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs b/MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs
index 0564c0613..86b508012 100644
--- a/MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaInfo/IMediaEncoder.cs
@@ -41,10 +41,11 @@ namespace MediaBrowser.Controller.MediaInfo
/// <param name="inputFiles">The input files.</param>
/// <param name="type">The type.</param>
/// <param name="subtitleStreamIndex">Index of the subtitle stream.</param>
+ /// <param name="copySubtitleStream">if set to true, copy stream instead of converting.</param>
/// <param name="outputPath">The output path.</param>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns>
- Task ExtractTextSubtitle(string[] inputFiles, InputType type, int subtitleStreamIndex, string outputPath, CancellationToken cancellationToken);
+ Task ExtractTextSubtitle(string[] inputFiles, InputType type, int subtitleStreamIndex, bool copySubtitleStream, string outputPath, CancellationToken cancellationToken);
/// <summary>
/// Converts the text subtitle to ass.