Modified TrackingThread
Modified TrackingThread
merging from origin
Merge branch 'master' of github.com:tjrantal/ffmpegDigitizer
Changed back to windows style
Added ifdef __linux__ for code that didn't compile on both linux and windows