diff options
| author | Cody Robibero <cody@robibe.ro> | 2022-08-16 21:23:39 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-16 21:23:39 -0600 |
| commit | fdd728e9f8b4592e4c41d9b3a87cc7859ef5fe1c (patch) | |
| tree | 51b86d858c332f923608eea5160a5b8120f8808b | |
| parent | 8ba83e41aee816c0c098b50296fb668202570baf (diff) | |
| parent | 7391b001eff764d88fad8f35daffa1de0ca0960e (diff) | |
Merge pull request #8259 from RealGreenDragon/subtitle-extraction-timeout
| -rw-r--r-- | CONTRIBUTORS.md | 1 | ||||
| -rw-r--r-- | MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index a7d2b2e40..9c08929e7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -157,6 +157,7 @@ - [jonas-resch](https://github.com/jonas-resch) - [vgambier](https://github.com/vgambier) - [MinecraftPlaye](https://github.com/MinecraftPlaye) + - [RealGreenDragon](https://github.com/RealGreenDragon) # Emby Contributors diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs index 6112fda68..8e1acc46c 100644 --- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs +++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs @@ -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) { |