Removed duplicated ifdef code from ffmpeg wrappers
This commit is contained in:
parent
7a59d6c77e
commit
1d7e09a9d5
modules/highgui/src
@ -51,19 +51,6 @@
|
||||
extern "C" {
|
||||
#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"
|
||||
|
||||
#ifdef WIN32
|
||||
|
@ -52,19 +52,6 @@
|
||||
extern "C" {
|
||||
#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"
|
||||
|
||||
#ifdef WIN32
|
||||
|
@ -44,6 +44,8 @@
|
||||
extern "C" {
|
||||
#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
|
||||
@ -52,6 +54,8 @@ extern "C" {
|
||||
#undef _STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
#include <errno.h>
|
||||
#endif
|
||||
|
||||
#ifdef WIN32
|
||||
#include <libavformat/avformat.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user