starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-22 16:54:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
crobibero
2020-08-04 20:30:45 -06:00
parent e65ecb5687
commit 393666efcf
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Controllers/DynamicHlsController.cs
View File

@@ -1828,7 +1828,7 @@ namespace Jellyfin.Api.Controllers
}
audioTranscodeParams.Add("-vn");
return string.Join(" ", audioTranscodeParams.ToArray());
return string.Join(' ', audioTranscodeParams);
}
if (EncodingHelper.IsCopyCodec(audioCodec))