diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp index 7d1be9cde9..fa847ce3b4 100644 --- a/modules/highgui/src/cap_ffmpeg_impl.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl.hpp @@ -55,7 +55,6 @@ extern "C" { #ifdef WIN32 #define HAVE_FFMPEG_SWSCALE 1 - #include #include #include #else @@ -65,13 +64,11 @@ extern "C" { #if defined(HAVE_GENTOO_FFMPEG) #define HAVE_LIBAVCODEC_AVCODEC_H 1 - #define HAVE_LIBAVFORMAT_AVFORMAT_H 1 #if defined(HAVE_FFMPEG_SWSCALE) #define HAVE_LIBSWSCALE_SWSCALE_H 1 #endif #elif defined HAVE_FFMPEG #define HAVE_FFMPEG_AVCODEC_H 1 - #define HAVE_FFMPEG_AVFORMAT_H 1 #if defined(HAVE_FFMPEG_SWSCALE) #define HAVE_FFMPEG_SWSCALE_H 1 #endif @@ -82,16 +79,10 @@ extern "C" { #if defined(HAVE_FFMPEG_AVCODEC_H) #include #endif -#if defined(HAVE_FFMPEG_AVFORMAT_H) - #include -#endif #if defined(HAVE_FFMPEG_SWSCALE_H) #include #endif -#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) - #include -#endif #if defined(HAVE_LIBAVCODEC_AVCODEC_H) #include #endif diff --git a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp index 82fd0b61e0..327dc4c5b2 100755 --- a/modules/highgui/src/cap_ffmpeg_impl_v2.hpp +++ b/modules/highgui/src/cap_ffmpeg_impl_v2.hpp @@ -56,7 +56,6 @@ extern "C" { #ifdef WIN32 #define HAVE_FFMPEG_SWSCALE 1 - #include #include #include #else @@ -66,13 +65,11 @@ extern "C" { #if defined(HAVE_GENTOO_FFMPEG) #define HAVE_LIBAVCODEC_AVCODEC_H 1 - #define HAVE_LIBAVFORMAT_AVFORMAT_H 1 #if defined(HAVE_FFMPEG_SWSCALE) #define HAVE_LIBSWSCALE_SWSCALE_H 1 #endif #elif defined HAVE_FFMPEG #define HAVE_FFMPEG_AVCODEC_H 1 - #define HAVE_FFMPEG_AVFORMAT_H 1 #if defined(HAVE_FFMPEG_SWSCALE) #define HAVE_FFMPEG_SWSCALE_H 1 #endif @@ -83,16 +80,10 @@ extern "C" { #if defined(HAVE_FFMPEG_AVCODEC_H) #include #endif -#if defined(HAVE_FFMPEG_AVFORMAT_H) - #include -#endif #if defined(HAVE_FFMPEG_SWSCALE_H) #include #endif -#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) - #include -#endif #if defined(HAVE_LIBAVCODEC_AVCODEC_H) #include #endif