edgarriba a242556b1d Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan ...

Conflicts:
	modules/imgcodecs/include/opencv2/imgcodecs.hpp

2015-10-31 20:18:41 +01:00

..

imgcodecs

Doxygen documentation for: highgui, video, imgcodecs and videoio

2014-12-01 15:47:13 +03:00

imgcodecs.hpp

Merge branch 'master' of https://github.com/Itseez/opencv into gdal_lan

2015-10-31 20:18:41 +01:00