mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 20:42:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed some dubious FFmpeg hack that no longer works.

Browse Source
This commit is contained in:
Roman Donchenko 2013-10-22 16:43:40 +04:00
parent 66beb44286
commit eb86d37b26
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/src/ffmpeg_codecs.hpp
View File

@ -60,14 +60,6 @@ extern "C" {
#include <errno.h> #include <errno.h>
#endif #endif
#ifdef WIN32
# 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
// if the header path is not specified explicitly, let's deduce it // if the header path is not specified explicitly, let's deduce it
#if !defined HAVE_FFMPEG_AVCODEC_H && !defined HAVE_LIBAVCODEC_AVCODEC_H #if !defined HAVE_FFMPEG_AVCODEC_H && !defined HAVE_LIBAVCODEC_AVCODEC_H
@ -81,14 +73,12 @@ extern "C" {
#include <ffmpeg/avformat.h> #include <ffmpeg/avformat.h>
#endif #endif
#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) #if defined(HAVE_LIBAVFORMAT_AVFORMAT_H) || defined(WIN32)
#include <libavformat/avformat.h> #include <libavformat/avformat.h>
#endif #endif
#endif #endif
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif