Remerged the 2.4.0 branch

2012-05-02 20:20:14 +00:00
parent 77717e1abc
commit 3a1f85d4e8
41 changed files with 2452 additions and 4857 deletions
--- a/3rdparty/ffmpeg/ffopencv.c
+++ b/3rdparty/ffmpeg/ffopencv.c
@@ -1 +1 @@
-#include "cap_ffmpeg_impl_v2.hpp"
+#include "cap_ffmpeg_impl.hpp"