Updated.
Merge branch 'master' of https://github.com/Mutinifni/VLC-OpenCV

Conflicts:
	face_pauseplay.cpp