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

Removed duplicated ifdef code from ffmpeg wrappers

Browse Source
This commit is contained in:
Alexander Reshetnikov 2012-03-26 13:51:05 +00:00
parent 7a59d6c77e
commit 1d7e09a9d5
3 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/highgui/src/cap_ffmpeg_impl.hpp
View File

@ -51,19 +51,6 @@
extern "C" { extern "C" {
#endif #endif
#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
#include <stdint.h>
#endif
#include <errno.h>
#endif
#include "ffmpeg_codecs.hpp" #include "ffmpeg_codecs.hpp"
#ifdef WIN32 #ifdef WIN32

13
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View File

@ -52,19 +52,6 @@
extern "C" { extern "C" {
#endif #endif
#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
#include <stdint.h>
#endif
#include <errno.h>
#endif
#include "ffmpeg_codecs.hpp" #include "ffmpeg_codecs.hpp"
#ifdef WIN32 #ifdef WIN32

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

@ -44,6 +44,8 @@
extern "C" { extern "C" {
#endif #endif
#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 #if !defined INT64_C || !defined UINT64_C
#define INT64_C #define INT64_C
#define UINT64_C #define UINT64_C
@ -52,6 +54,8 @@ extern "C" {
#undef _STDINT_H #undef _STDINT_H
#include <stdint.h> #include <stdint.h>
#endif #endif
#include <errno.h>
#endif
#ifdef WIN32 #ifdef WIN32
#include <libavformat/avformat.h> #include <libavformat/avformat.h>