Make highgui.hpp independent from C API

2013-04-07 22:45:38 +04:00
parent 288a0634c2
commit 0738ea7d0f
152 changed files with 899 additions and 594 deletions
--- a/modules/highgui/src/ffmpeg_codecs.hpp
+++ b/modules/highgui/src/ffmpeg_codecs.hpp
@@ -61,7 +61,9 @@ extern "C" {
 #endif

 #ifdef WIN32
-  #include <libavformat/avformat.h>
+#  define AVUTIL_COMMON_H
+#  define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
+#  include <libavformat/avformat.h>
 #else

 // if the header path is not specified explicitly, let's deduce it