diff options
| author | Abdulmohsen <ArabCoders@users.noreply.github.com> | 2023-11-24 00:00:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-24 00:00:53 +0300 |
| commit | 9d5dc4d71b6f542d4adb60a6287a86f558c1dcc2 (patch) | |
| tree | b646b8209bd90df22c4a2a2df612f09b3be2c170 /MediaBrowser.MediaEncoding/Subtitles | |
| parent | 324c86e14d9d76670b4e3439c2ed5fcbbfb9f8ff (diff) | |
| parent | 3d4d33bcbac07be40c132cf3a3c39630ace7b444 (diff) | |
Merge branch 'jellyfin:master' into master
Diffstat (limited to 'MediaBrowser.MediaEncoding/Subtitles')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs index 0d4489517..fd55db4ba 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEditParser.cs @@ -88,7 +88,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles public bool SupportsFileExtension(string fileExtension) => _subtitleFormats.ContainsKey(fileExtension); - private IEnumerable<SubtitleFormat> GetSubtitleFormats() + private List<SubtitleFormat> GetSubtitleFormats() { var subtitleFormats = new List<SubtitleFormat>(); var assembly = typeof(SubtitleFormat).Assembly; diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 8eea773d8..459d854bf 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -63,7 +63,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles"); - private Stream ConvertSubtitles( + private MemoryStream ConvertSubtitles( Stream stream, string inputFormat, string outputFormat, |