diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-08-09 16:51:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-09 16:51:48 +0200 |
| commit | f4302822f07111badb7f6439f1ede3ab77779030 (patch) | |
| tree | fb8de95a4239b2f500e5430d32e3c6b8a12e5009 | |
| parent | 75bb127599c2507391c612332d1866d1fdc9da13 (diff) | |
| parent | 542185fba45b11b1701cc53150e3e1ece5f09cc1 (diff) | |
Merge pull request #3846 from YouKnowBlom/fix-cc-hls
Avoid including stray commas in HLS codecs field
| -rw-r--r-- | Jellyfin.Api/Controllers/DynamicHlsController.cs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs index f6f08e873..d581ab8cd 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -1496,9 +1496,14 @@ namespace Jellyfin.Api.Controllers StringBuilder codecs = new StringBuilder(); - codecs.Append(videoCodecs) - .Append(',') - .Append(audioCodecs); + codecs.Append(videoCodecs); + + if (!string.IsNullOrEmpty(videoCodecs) && !string.IsNullOrEmpty(audioCodecs)) + { + codecs.Append(','); + } + + codecs.Append(audioCodecs); if (codecs.Length > 1) { |