get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg

2012-04-30 12:39:22 +00:00
parent 09ca294a76
commit 2c88791600
7 changed files with 832 additions and 2270 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