diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-10 08:52:01 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-10 08:52:01 -0500 |
| commit | ec4000404d59ee0e8342805cf7ce0c4ca04023b4 (patch) | |
| tree | dc25abe9fa806b9f676af95ad61b9ac612f252f8 /MediaBrowser.Common | |
| parent | c23bd68220fc01a6ccd1436fde91c51e473e1ae8 (diff) | |
rework text subtitles
Diffstat (limited to 'MediaBrowser.Common')
| -rw-r--r-- | MediaBrowser.Common/MediaInfo/IMediaEncoder.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Common/Net/MimeTypes.cs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs b/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs index 31fa78fdb8..82643779b3 100644 --- a/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs +++ b/MediaBrowser.Common/MediaInfo/IMediaEncoder.cs @@ -40,11 +40,10 @@ namespace MediaBrowser.Common.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="offset">The offset.</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, TimeSpan offset, string outputPath, CancellationToken cancellationToken); + Task ExtractTextSubtitle(string[] inputFiles, InputType type, int subtitleStreamIndex, string outputPath, CancellationToken cancellationToken); /// <summary> /// Converts the text subtitle to ass. @@ -52,10 +51,9 @@ namespace MediaBrowser.Common.MediaInfo /// <param name="inputPath">The input path.</param> /// <param name="outputPath">The output path.</param> /// <param name="language">The language.</param> - /// <param name="offset">The offset.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> - Task ConvertTextSubtitleToAss(string inputPath, string outputPath, string language, TimeSpan offset, CancellationToken cancellationToken); + Task ConvertTextSubtitleToAss(string inputPath, string outputPath, string language, CancellationToken cancellationToken); /// <summary> /// Gets the media info. diff --git a/MediaBrowser.Common/Net/MimeTypes.cs b/MediaBrowser.Common/Net/MimeTypes.cs index 47536a341e..85b9b1f38f 100644 --- a/MediaBrowser.Common/Net/MimeTypes.cs +++ b/MediaBrowser.Common/Net/MimeTypes.cs @@ -67,7 +67,7 @@ namespace MediaBrowser.Common.Net } if (ext.Equals(".avi", StringComparison.OrdinalIgnoreCase)) { - return "video/avi"; + return "video/x-msvideo"; } if (ext.Equals(".m4v", StringComparison.OrdinalIgnoreCase)) { |