2 Commits

Author	SHA1	Message	Date
Vadim Pisarevsky	fd68cc768a	fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)	2012-05-21 14:56:07 +00:00
Vadim Pisarevsky	d5a0088bbe	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00