Roman Donchenko 5455e38e15 cap_msmf.hpp: fix a warning about nNull being unused ... The two functions featuring nNull are not particularly needed, so I simply removed them. Conflicts: modules/highgui/src/cap_msmf.hpp		2015-04-25 18:54:54 +02:00
..
include/opencv2	Fixed markdown: **Note** -> @note	2015-04-22 08:08:10 +02:00
misc/java/test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	cap_msmf.hpp: fix a warning about nNull being unused	2015-04-25 18:54:54 +02:00
test	make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)	2015-04-22 21:57:29 +03:00
CMakeLists.txt	added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"	2015-03-26 00:39:29 +03:00