mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-08 23:00:51 +02:00
fix merge conflicts
This commit is contained in:
parent
e65ecb5687
commit
393666efcf
|
@ -1828,7 +1828,7 @@ namespace Jellyfin.Api.Controllers
|
||||||
}
|
}
|
||||||
|
|
||||||
audioTranscodeParams.Add("-vn");
|
audioTranscodeParams.Add("-vn");
|
||||||
return string.Join(" ", audioTranscodeParams.ToArray());
|
return string.Join(' ', audioTranscodeParams);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (EncodingHelper.IsCopyCodec(audioCodec))
|
if (EncodingHelper.IsCopyCodec(audioCodec))
|
||||||
|
|
|
@ -262,8 +262,6 @@ namespace Jellyfin.Api.Controllers
|
||||||
|
|
||||||
var mediaSource = await _mediaSourceManager.GetMediaSource(item, mediaSourceId, null, false, CancellationToken.None).ConfigureAwait(false);
|
var mediaSource = await _mediaSourceManager.GetMediaSource(item, mediaSourceId, null, false, CancellationToken.None).ConfigureAwait(false);
|
||||||
|
|
||||||
var builder = new StringBuilder();
|
|
||||||
|
|
||||||
var runtime = mediaSource.RunTimeTicks ?? -1;
|
var runtime = mediaSource.RunTimeTicks ?? -1;
|
||||||
|
|
||||||
if (runtime <= 0)
|
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)");
|
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")
|
builder.AppendLine("#EXTM3U")
|
||||||
.Append("#EXT-X-TARGETDURATION:")
|
.Append("#EXT-X-TARGETDURATION:")
|
||||||
.AppendLine(segmentLength.ToString(CultureInfo.InvariantCulture))
|
.AppendLine(segmentLength.ToString(CultureInfo.InvariantCulture))
|
||||||
|
|
Loading…
Reference in a new issue