mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 19:37:55 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
b93641e503
2 changed files with 2 additions and 2 deletions
|
@ -274,7 +274,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||
|
||||
var threads = GetNumberOfThreads(false);
|
||||
|
||||
var args = string.Format("{0}{1} {2} {3} -i {4}{5} -map_metadata -1 -threads {6} {7} {8} -sc_threshold 0 {9} -hls_time {10} -start_number 0 -hls_list_size 1440 \"{11}\"",
|
||||
var args = string.Format("{0}{1} {2} {3} -fflags genpts -i {4}{5} -map_metadata -1 -threads {6} {7} {8} -sc_threshold 0 {9} -hls_time {10} -start_number 0 -hls_list_size 1440 \"{11}\"",
|
||||
itsOffset,
|
||||
probeSize,
|
||||
GetUserAgentParam(state.MediaPath),
|
||||
|
|
|
@ -106,7 +106,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||
|
||||
var threads = GetNumberOfThreads(string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
return string.Format("{0} {1} {2} -i {3}{4}{5} {6} {7} -map_metadata -1 -threads {8} {9}{10} \"{11}\"",
|
||||
return string.Format("{0} {1} {2} -fflags genpts -i {3}{4}{5} {6} {7} -map_metadata -1 -threads {8} {9}{10} \"{11}\"",
|
||||
probeSize,
|
||||
GetUserAgentParam(state.MediaPath),
|
||||
GetFastSeekCommandLineParameter(state.Request),
|
||||
|
|
Loading…
Reference in a new issue