alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-03 22:38:30 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into hwaccel

Browse Source
This commit is contained in:
dkanada
2020-06-15 20:21:25 +09:00
committed by GitHub
parent b79957d07e 100e9d586d
commit dabb869a6b
471 changed files with 4933 additions and 4044 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
MediaBrowser.MediaEncoding/Subtitles/SsaParser.cs
View File

@@ -130,10 +130,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
}
}
//if (header.Length > 0)
//subtitle.Header = header.ToString();
// if (header.Length > 0)
// subtitle.Header = header.ToString();
//subtitle.Renumber(1);
// subtitle.Renumber(1);
}
trackInfo.TrackEvents = trackEvents.ToArray();
return trackInfo;
@@ -261,7 +261,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
text += "</font>";
}
}
}
text = text.Replace(@"{\i1}", "<i>");

3
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@@ -25,7 +25,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
public class SubtitleEncoder : ISubtitleEncoder
{
private readonly ILibraryManager _libraryManager;
private readonly ILogger _logger;
private readonly ILogger<SubtitleEncoder> _logger;
private readonly IApplicationPaths _appPaths;
private readonly IFileSystem _fileSystem;
private readonly IMediaEncoder _mediaEncoder;
@@ -640,7 +640,6 @@ namespace MediaBrowser.MediaEncoding.Subtitles
}
catch (FileNotFoundException)
{
}
catch (IOException ex)
{