mirror
/
av
mirror of https://bitbucket.org/ausocean/av.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed conflict

This commit is contained in:
saxon.milton@gmail.com 2018-03-14 08:33:38 +10:30
parent 2a0652042b
commit 2787110e14
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
revid/RevidInstance.go
View File

@ -315,11 +315,7 @@ func (r *revidInst) outputClips() {
for r.isRunning {
// Here we slow things down as much as we can to decrease cpu usage
switch {
<<<<<<< HEAD
case r.ringBuffer.GetNoOfElements() < 200:
=======
case r.ringBuffer.GetNoOfElements() < 2:
>>>>>>> 2eae228d739eec6c71ac204250b980cc1c158a91
delay++
time.Sleep(time.Duration(delay) * time.Millisecond)
case delay > 0: