Merge pull request #1164 from MediaBrowser/dev

3.0.5724.1

2 files changed, 7 insertions, 18 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index 5bec7980a..23285b612 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -116,5 +116,12 @@ namespace MediaBrowser.Controller.MediaEncoding
         Task<string> EncodeVideo(EncodingJobOptions options,
             IProgress<double> progress,
             CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Escapes the subtitle filter path.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>System.String.</returns>
+        string EscapeSubtitleFilterPath(string path);
     }
 }
diff --git a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
index e4a2cd007..826711e51 100644
--- a/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/ISubtitleEncoder.cs
@@ -8,24 +8,6 @@ namespace MediaBrowser.Controller.MediaEncoding
     public interface ISubtitleEncoder
     {
         /// <summary>
-        /// Converts the subtitles.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="inputFormat">The input format.</param>
-        /// <param name="outputFormat">The output format.</param>
-        /// <param name="startTimeTicks">The start time ticks.</param>
-        /// <param name="endTimeTicks">The end time ticks.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        Task<Stream> ConvertSubtitles(
-            Stream stream,
-            string inputFormat,
-            string outputFormat,
-            long startTimeTicks,
-            long? endTimeTicks,
-            CancellationToken cancellationToken);
-
-        /// <summary>
         /// Gets the subtitles.
         /// </summary>
         /// <param name="itemId">The item identifier.</param>