alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 09:34:44 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'jellyfin:master' into master

Browse Source
This commit is contained in:
Negulici-R. Barnabas
2022-08-22 07:19:39 +03:00
committed by GitHub
parent 5196f63d43 8a0911004d
commit 1e41636e30
14 changed files with 132 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -574,7 +574,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
throw;
}
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(5)).ConfigureAwait(false);
var ranToCompletion = await process.WaitForExitAsync(TimeSpan.FromMinutes(30)).ConfigureAwait(false);
if (!ranToCompletion)
{