Alexander Reshetnikov 3ec43a11ed Fixed read error in VideoCapture for images (bug #1892); minor fix of ffmpeg wrapper warning		2012-05-05 14:43:03 +00:00
..
doc	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
include/opencv2/highgui	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
perf	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00
src	Fixed read error in VideoCapture for images (bug #1892); minor fix of ffmpeg wrapper warning	2012-05-05 14:43:03 +00:00
test	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
CMakeLists.txt	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00