From eb86d37b260aba29b0008d1eeb04a58a5d0e9f85 Mon Sep 17 00:00:00 2001
From: Roman Donchenko <roman.donchenko@itseez.com>
Date: Tue, 22 Oct 2013 16:43:40 +0400
Subject: [PATCH] Removed some dubious FFmpeg hack that no longer works.

---
 modules/highgui/src/ffmpeg_codecs.hpp | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/modules/highgui/src/ffmpeg_codecs.hpp b/modules/highgui/src/ffmpeg_codecs.hpp
index c1e116b..5bdd4cd 100644
--- a/modules/highgui/src/ffmpeg_codecs.hpp
+++ b/modules/highgui/src/ffmpeg_codecs.hpp
@@ -60,14 +60,6 @@ extern "C" {
 #include <errno.h>
 #endif
 
-#ifdef WIN32
-#  ifdef __OPENCV_BUILD
-#    define AVUTIL_COMMON_H
-#    define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-#  endif
-#  include <libavformat/avformat.h>
-#else
-
 // if the header path is not specified explicitly, let's deduce it
 #if !defined HAVE_FFMPEG_AVCODEC_H && !defined HAVE_LIBAVCODEC_AVCODEC_H
 
@@ -81,14 +73,12 @@ extern "C" {
   #include <ffmpeg/avformat.h>
 #endif
 
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
+#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(WIN32)
   #include <libavformat/avformat.h>
 #endif
 
 #endif
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif
-- 
2.7.4