Fix build errors

This commit is contained in:
Andrey Kamaev
2013-04-08 15:09:48 +04:00
parent befd696720
commit dd74a851f3
9 changed files with 36 additions and 36 deletions

View File

@@ -41,7 +41,7 @@
#include "precomp.hpp"
#ifndef WIN32
#if defined HAVE_FFMPEG && !defined WIN32
#include "cap_ffmpeg_impl.hpp"
#else
#include "cap_ffmpeg_api.hpp"

View File

@@ -61,8 +61,10 @@ extern "C" {
#endif
#ifdef WIN32
# define AVUTIL_COMMON_H
# define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
# 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