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:
bdd10c1
)
another attempt to fix cvcap_ffmpeg.cpp compile errors
author
Vadim Pisarevsky
<no@email>
Fri, 11 Jun 2010 18:43:46 +0000
(18:43 +0000)
committer
Vadim Pisarevsky
<no@email>
Fri, 11 Jun 2010 18:43:46 +0000
(18:43 +0000)
modules/highgui/src/cap_ffmpeg.cpp
patch
|
blob
|
history
diff --git
a/modules/highgui/src/cap_ffmpeg.cpp
b/modules/highgui/src/cap_ffmpeg.cpp
index
eb468c2
..
24702fe
100644
(file)
--- a/
modules/highgui/src/cap_ffmpeg.cpp
+++ b/
modules/highgui/src/cap_ffmpeg.cpp
@@
-49,6
+49,8
@@
extern "C" {
#if !defined(WIN32) || defined(__MINGW32__)
// some versions of FFMPEG assume a C99 compiler, and don't define INT64_C
#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