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/DynamicHlsController.cs | |
| parent | e65ecb5687af42270974dec77b38137407611bec (diff) | |
fix merge conflicts
Diffstat (limited to 'Jellyfin.Api/Controllers/DynamicHlsController.cs')
| -rw-r--r-- | Jellyfin.Api/Controllers/DynamicHlsController.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs index ec65cb95a..f6f08e873 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -1828,7 +1828,7 @@ namespace Jellyfin.Api.Controllers } audioTranscodeParams.Add("-vn"); - return string.Join(" ", audioTranscodeParams.ToArray()); + return string.Join(' ', audioTranscodeParams); } if (EncodingHelper.IsCopyCodec(audioCodec)) |