From 1d7e09a9d547dbb808cc9ee022bd2086f9973a97 Mon Sep 17 00:00:00 2001
From: Alexander Reshetnikov <no@email>
Date: Mon, 26 Mar 2012 13:51:05 +0000
Subject: [PATCH] Removed duplicated ifdef code from ffmpeg wrappers

---
 modules/highgui/src/cap_ffmpeg_impl.hpp    | 13 -------------
 modules/highgui/src/cap_ffmpeg_impl_v2.hpp | 13 -------------
 modules/highgui/src/ffmpeg_codecs.hpp      |  4 ++++
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp
index a5a9392b23..ecb1d42e77 100644
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
@@ -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
diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
index 84ab51d2a1..80fb2a5128 100755
--- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
+++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp
@@ -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
diff --git a/modules/highgui/src/ffmpeg_codecs.hpp b/modules/highgui/src/ffmpeg_codecs.hpp
index 453828c84d..a9654ad9a5 100644
--- a/modules/highgui/src/ffmpeg_codecs.hpp
+++ b/modules/highgui/src/ffmpeg_codecs.hpp
@@ -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>