Changes of highgui structure

2012-04-09 17:38:46 +00:00
parent 213a23e860
commit 05abdcd64f
3 changed files with 8 additions and 267 deletions
--- a/modules/highgui/src/cap_ffmpeg.cpp
+++ b/modules/highgui/src/cap_ffmpeg.cpp
@@ -42,7 +42,11 @@
 #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