generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed INT64_C & UINT64_C definitions (patch #2033)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-10-10 17:27:32 +04:00
parent 2f4e8ee73e
commit 0e314163e5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/highgui/src/ffmpeg_codecs.hpp
View File

@@ -46,14 +46,17 @@ extern "C" {
#if !defined(WIN32) || defined(__MINGW32__) #if !defined(WIN32) || defined(__MINGW32__)
// some versions of FFMPEG assume a C99 compiler, and don't define INT64_C // 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
#include <stdint.h> #include <stdint.h>
// some versions of FFMPEG assume a C99 compiler, and don't define INT64_C
#ifndef INT64_C
#define INT64_C(c) (c##LL)
#endif #endif
#ifndef UINT64_C
#define UINT64_C(c) (c##ULL)
#endif
#include <errno.h> #include <errno.h>
#endif #endif