diff options
| author | Eric Reed <ebr@mediabrowser3.com> | 2013-04-27 12:24:31 -0400 |
|---|---|---|
| committer | Eric Reed <ebr@mediabrowser3.com> | 2013-04-27 12:24:31 -0400 |
| commit | e0e2614543f87bd40a071d3e64cd1a7d61bc106b (patch) | |
| tree | 8e8b23a01e8ca29baaa82d25e72fa13eaa13b0d8 /MediaBrowser.Common | |
| parent | 6e7684ae0167efed8d3f64a9a49e6d1cc27abee8 (diff) | |
| parent | 46cf7d93e9727f6cf9b1b1d229804a89fdb6b74c (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/MediaInfo/IMediaEncoder.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs b/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs index 8dc18067c6..6d606e6847 100644 --- a/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs +++ b/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs @@ -49,9 +49,10 @@ namespace MediaBrowser.Common.MediaInfo /// </summary> /// <param name="inputPath">The input path.</param> /// <param name="outputPath">The output path.</param> + /// <param name="offset">The offset.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - Task ConvertTextSubtitleToAss(string inputPath, string outputPath, CancellationToken cancellationToken); + Task ConvertTextSubtitleToAss(string inputPath, string outputPath, TimeSpan offset, CancellationToken cancellationToken); /// <summary> /// Gets the media info. |