simpler videotest
Merge branch 'master' into mdVideoThread

Conflicts:
	tests/AutoTest/VideoTest.cpp
	tests/AutoTest/VideoTest.h
reduce difference with master