diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp index 870804dd8..dd9c47c54 100644 --- a/modules/highgui/src/cap_ffmpeg_impl.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl.hpp @@ -45,6 +45,8 @@ #include #include +#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c ) + #if defined _MSC_VER && _MSC_VER >= 1200 #pragma warning( disable: 4244 4510 4512 4610 ) #endif @@ -61,9 +63,12 @@ extern "C" { #include +#if LIBAVUTIL_BUILD > CALC_FFMPEG_VERSION(51,11,0) + #include +#endif + #ifdef WIN32 #define HAVE_FFMPEG_SWSCALE 1 - #include #include #include #else @@ -124,7 +129,6 @@ extern "C" { #define PIX_FMT_RGBA32 PIX_FMT_RGB32 #endif -#define CALC_FFMPEG_VERSION(a,b,c) ( a<<16 | b<<8 | c ) #if defined WIN32 || defined _WIN32 #include