Roman Donchenko 3f3ae33327 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. ... This should actually remove the need for the workaround from the previous commit.		2013-10-23 14:56:37 +04:00
..
doc	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
include/opencv2	Merge branch 'master' into gpu-cuda-rename	2013-09-06 15:44:44 +04:00
perf	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
src	Removed some dubious FFmpeg hack that no longer works.	2013-10-23 14:56:37 +04:00
test	Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp.	2013-10-23 14:56:37 +04:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/2.4' into merge-2.4	2013-10-15 20:08:52 +04:00