modified:   src/control/play/PlayManager.cpp
	modified:   src/control/play/PlayManager.h
	modified:   src/control/play/RealPlayObj.cpp
Merge branch 'master' of https://github.com/joorhy/jorhy-prj

Conflicts:
	src/host/hik/HikStream.cpp

	new file:   codelite/joiss/OnvifHost2.project
	modified:   src/host/hik/HikStream.cpp
	modified:   src/misc/x_vod_manager.cpp