michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #666 from tikuf/master

Browse Source 
Add pts generation
This commit is contained in:
Luke 2014-01-14 17:50:55 -08:00
commit e5b8d1ed32
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
View File

@ -274,7 +274,7 @@ namespace MediaBrowser.Api.Playback.Hls
var threads = GetNumberOfThreads(false); 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, itsOffset,
probeSize, probeSize,
GetUserAgentParam(state.MediaPath), GetUserAgentParam(state.MediaPath),

2
MediaBrowser.Api/Playback/Progressive/VideoService.cs
View File

@ -106,7 +106,7 @@ namespace MediaBrowser.Api.Playback.Progressive
var threads = GetNumberOfThreads(string.Equals(videoCodec, "libvpx", StringComparison.OrdinalIgnoreCase)); 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, probeSize,
GetUserAgentParam(state.MediaPath), GetUserAgentParam(state.MediaPath),
GetFastSeekCommandLineParameter(state.Request), GetFastSeekCommandLineParameter(state.Request),