Changes to the video test.
Merge branch 'master' of github.com:escusado/opencv-artoolkit

Conflicts:
	video-test.py