Made some changes to increase backwards compatibility toward OpenCV
Merge branch 'master' of https://github.com/david-zwicker/video-analysis