projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6d1f4bf
)
Fixed compilation error for ffmpeg tests
author
Alexander Reshetnikov
<no@email>
Mon, 26 Mar 2012 12:27:00 +0000
(12:27 +0000)
committer
Alexander Reshetnikov
<no@email>
Mon, 26 Mar 2012 12:27:00 +0000
(12:27 +0000)
modules/highgui/src/ffmpeg_codecs.hpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/ffmpeg_codecs.hpp
b/modules/highgui/src/ffmpeg_codecs.hpp
index
7d28e92
..
453828c
100644
(file)
--- a/
modules/highgui/src/ffmpeg_codecs.hpp
+++ b/
modules/highgui/src/ffmpeg_codecs.hpp
@@
-44,6
+44,15
@@
extern "C" {
#endif
+#if !defined INT64_C || !defined UINT64_C
+#define INT64_C
+#define UINT64_C
+ #define __STDC_CONSTANT_MACROS
+// force re-inclusion of stdint.h to get INT64_C macro
+#undef _STDINT_H
+#include <stdint.h>
+#endif
+
#ifdef WIN32
#include <libavformat/avformat.h>
#else