fix declaration

refix declaration
Merge branch 'ecc' of https://github.com/evangelidis/opencv into ecc

Conflicts:
	modules/video/include/opencv2/video/tracking.hpp
fix C wrapper