ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix wallclock timestamp toggler

merge-requests/289/merge
Moe 2021-06-09 12:58:11 -07:00
parent d33f8073cf
commit 7de8363a59
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ffmpeg/builders.js
View File

@ -307,7 +307,7 @@ module.exports = (s,config,lang) => {
const isStreamer = inputTypeIsStreamer(e)
const isCudaEnabled = hasCudaEnabled(e)
const inputFlags = []
const useWallclockTimestamp = config.wallClockTimestampAsDefault || e.details.wall_clock_timestamp_ignore !== '1'
const useWallclockTimestamp = e.details.wall_clock_timestamp_ignore !== '1' || config.wallClockTimestampAsDefault && !e.details.wall_clock_timestamp_ignore
const inputTypeIsH264 = e.type === 'h264'
const protocolIsRtsp = e.protocol === 'rtsp'
const inputTypeCanLoop = e.type === 'mp4' || e.type === 'local'