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

Fix build of ffmpeg wrapper with some versions of avutil

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-14 14:50:03 +04:00
parent d9cd753835
commit 14d27112e9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,6 +45,8 @@
#include <algorithm> #include <algorithm>
#include <limits> #include <limits>
#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c )
#if defined _MSC_VER && _MSC_VER >= 1200 #if defined _MSC_VER && _MSC_VER >= 1200
#pragma warning( disable: 4244 4510 4512 4610 ) #pragma warning( disable: 4244 4510 4512 4610 )
#endif #endif
@ -61,9 +63,12 @@ extern "C" {
#include <libavutil/mathematics.h> #include <libavutil/mathematics.h>
#if LIBAVUTIL_BUILD > CALC_FFMPEG_VERSION(51,11,0)
#include <libavutil/opt.h>
#endif
#ifdef WIN32 #ifdef WIN32
#define HAVE_FFMPEG_SWSCALE 1 #define HAVE_FFMPEG_SWSCALE 1
#include <libavutil/opt.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#else #else
@ -124,7 +129,6 @@ extern "C" {
#define PIX_FMT_RGBA32 PIX_FMT_RGB32 #define PIX_FMT_RGBA32 PIX_FMT_RGB32
#endif #endif
#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c )
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
#include <windows.h> #include <windows.h>