diff options
| author | crobibero <cody@robibe.ro> | 2020-08-31 10:32:28 -0600 |
|---|---|---|
| committer | crobibero <cody@robibe.ro> | 2020-08-31 10:32:28 -0600 |
| commit | 95402df88408b96300e627b9962d0e4db2e4c7c5 (patch) | |
| tree | 91cc4d6c271e99256a39f3cacbe1a49bb40ef71a /Jellyfin.Api/Controllers/DynamicHlsController.cs | |
| parent | e48df7da5e3d3eb81f68e71c0fe27a64063f00ac (diff) | |
| parent | 95142643f6c98fe4380c63ba9b3055fd3a637466 (diff) | |
Merge remote-tracking branch 'upstream/master' into default-http-client
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 b4fe3bc8f..b115ac6cd 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -1356,7 +1356,7 @@ namespace Jellyfin.Api.Controllers return string.Format( CultureInfo.InvariantCulture, - "{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -copyts -avoid_negative_ts disabled -f hls -max_delay 5000000 -hls_time {6} -individual_header_trailer 0 -hls_segment_type {7} -start_number {8} -hls_segment_filename \"{9}\" -hls_playlist_type vod -hls_list_size 0 -y \"{10}\"", + "{0} {1} -map_metadata -1 -map_chapters -1 -threads {2} {3} {4} {5} -copyts -avoid_negative_ts disabled -max_muxing_queue_size 2048 -f hls -max_delay 5000000 -hls_time {6} -individual_header_trailer 0 -hls_segment_type {7} -start_number {8} -hls_segment_filename \"{9}\" -hls_playlist_type vod -hls_list_size 0 -y \"{10}\"", inputModifier, _encodingHelper.GetInputArgument(state, encodingOptions), threads, |