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/modules/highgui/src/cap_ffmpeg.cpp
+++ b/modules/highgui/src/cap_ffmpeg.cpp
@@ -42,11 +42,7 @@
 #include "precomp.hpp"

 #ifdef HAVE_FFMPEG
-#ifdef NEW_FFMPEG
-#include "cap_ffmpeg_impl_v2.hpp"
-#else
 #include "cap_ffmpeg_impl.hpp"
-#endif
 #else
 #include "cap_ffmpeg_api.hpp"
 #endif
--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp