diff options
| author | crobibero <cody@robibe.ro> | 2020-08-04 20:30:45 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-04 20:30:45 -0600 |
| commit | 393666efcfa85e858857334b5cb5a3ec70586f20 (patch) | |
| tree | d18dd39b10c85733c66dc4ce619a304a0087ca03 /Jellyfin.Api/Controllers/SubtitleController.cs | |
| parent | e65ecb5687af42270974dec77b38137407611bec (diff) | |
fix merge conflicts
Diffstat (limited to 'Jellyfin.Api/Controllers/SubtitleController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/SubtitleController.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/SubtitleController.cs b/Jellyfin.Api/Controllers/SubtitleController.cs index 22144ab1a..d5633fba5 100644 --- a/Jellyfin.Api/Controllers/SubtitleController.cs +++ b/Jellyfin.Api/Controllers/SubtitleController.cs @@ -262,8 +262,6 @@ namespace Jellyfin.Api.Controllers var mediaSource = await _mediaSourceManager.GetMediaSource(item, mediaSourceId, null, false, CancellationToken.None).ConfigureAwait(false); - var builder = new StringBuilder(); - var runtime = mediaSource.RunTimeTicks ?? -1; if (runtime <= 0) @@ -277,6 +275,7 @@ namespace Jellyfin.Api.Controllers throw new ArgumentException("segmentLength was not given, or it was given incorrectly. (It should be bigger than 0)"); } + var builder = new StringBuilder(); builder.AppendLine("#EXTM3U") .Append("#EXT-X-TARGETDURATION:") .AppendLine(segmentLength.ToString(CultureInfo.InvariantCulture)) |