Skip to content

O
opencv
Commit 4ec2ad91 authored by Alexander Reshetnikov's avatar Alexander Reshetnikov
Browse files
Options

Removed duplicated includes from ffmpeg wrappers

parent 958d5a0c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 18 deletions
modules/highgui/src/cap_ffmpeg_impl.hpp
View file @ 4ec2ad91
...@@ -55,7 +55,6 @@ extern "C" { ...@@ -55,7 +55,6 @@ extern "C" {
#ifdef WIN32 #ifdef WIN32
#define HAVE_FFMPEG_SWSCALE 1 #define HAVE_FFMPEG_SWSCALE 1
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#else #else
...@@ -65,13 +64,11 @@ extern "C" { ...@@ -65,13 +64,11 @@ extern "C" {
#if defined(HAVE_GENTOO_FFMPEG) #if defined(HAVE_GENTOO_FFMPEG)
#define HAVE_LIBAVCODEC_AVCODEC_H 1 #define HAVE_LIBAVCODEC_AVCODEC_H 1
#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
#if defined(HAVE_FFMPEG_SWSCALE) #if defined(HAVE_FFMPEG_SWSCALE)
#define HAVE_LIBSWSCALE_SWSCALE_H 1 #define HAVE_LIBSWSCALE_SWSCALE_H 1
#endif #endif
#elif defined HAVE_FFMPEG #elif defined HAVE_FFMPEG
#define HAVE_FFMPEG_AVCODEC_H 1 #define HAVE_FFMPEG_AVCODEC_H 1
#define HAVE_FFMPEG_AVFORMAT_H 1
#if defined(HAVE_FFMPEG_SWSCALE) #if defined(HAVE_FFMPEG_SWSCALE)
#define HAVE_FFMPEG_SWSCALE_H 1 #define HAVE_FFMPEG_SWSCALE_H 1
#endif #endif
...@@ -82,16 +79,10 @@ extern "C" { ...@@ -82,16 +79,10 @@ extern "C" {
#if defined(HAVE_FFMPEG_AVCODEC_H) #if defined(HAVE_FFMPEG_AVCODEC_H)
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#endif #endif
#if defined(HAVE_FFMPEG_AVFORMAT_H)
#include <ffmpeg/avformat.h>
#endif
#if defined(HAVE_FFMPEG_SWSCALE_H) #if defined(HAVE_FFMPEG_SWSCALE_H)
#include <ffmpeg/swscale.h> #include <ffmpeg/swscale.h>
#endif #endif
#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
#include <libavformat/avformat.h>
#endif
#if defined(HAVE_LIBAVCODEC_AVCODEC_H) #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#endif #endif
......
modules/highgui/src/cap_ffmpeg_impl_v2.hpp
View file @ 4ec2ad91
...@@ -56,7 +56,6 @@ extern "C" { ...@@ -56,7 +56,6 @@ extern "C" {
#ifdef WIN32 #ifdef WIN32
#define HAVE_FFMPEG_SWSCALE 1 #define HAVE_FFMPEG_SWSCALE 1
#include <libavformat/avformat.h>
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#include <libswscale/swscale.h> #include <libswscale/swscale.h>
#else #else
...@@ -66,13 +65,11 @@ extern "C" { ...@@ -66,13 +65,11 @@ extern "C" {
#if defined(HAVE_GENTOO_FFMPEG) #if defined(HAVE_GENTOO_FFMPEG)
#define HAVE_LIBAVCODEC_AVCODEC_H 1 #define HAVE_LIBAVCODEC_AVCODEC_H 1
#define HAVE_LIBAVFORMAT_AVFORMAT_H 1
#if defined(HAVE_FFMPEG_SWSCALE) #if defined(HAVE_FFMPEG_SWSCALE)
#define HAVE_LIBSWSCALE_SWSCALE_H 1 #define HAVE_LIBSWSCALE_SWSCALE_H 1
#endif #endif
#elif defined HAVE_FFMPEG #elif defined HAVE_FFMPEG
#define HAVE_FFMPEG_AVCODEC_H 1 #define HAVE_FFMPEG_AVCODEC_H 1
#define HAVE_FFMPEG_AVFORMAT_H 1
#if defined(HAVE_FFMPEG_SWSCALE) #if defined(HAVE_FFMPEG_SWSCALE)
#define HAVE_FFMPEG_SWSCALE_H 1 #define HAVE_FFMPEG_SWSCALE_H 1
#endif #endif
...@@ -83,16 +80,10 @@ extern "C" { ...@@ -83,16 +80,10 @@ extern "C" {
#if defined(HAVE_FFMPEG_AVCODEC_H) #if defined(HAVE_FFMPEG_AVCODEC_H)
#include <ffmpeg/avcodec.h> #include <ffmpeg/avcodec.h>
#endif #endif
#if defined(HAVE_FFMPEG_AVFORMAT_H)
#include <ffmpeg/avformat.h>
#endif
#if defined(HAVE_FFMPEG_SWSCALE_H) #if defined(HAVE_FFMPEG_SWSCALE_H)
#include <ffmpeg/swscale.h> #include <ffmpeg/swscale.h>
#endif #endif
#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
#include <libavformat/avformat.h>
#endif
#if defined(HAVE_LIBAVCODEC_AVCODEC_H) #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
#include <libavcodec/avcodec.h> #include <libavcodec/avcodec.h>
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment