mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 10:39:08 +08:00
7a0c97b6b3
* [OpenCV2] add library for older C projects * [OpenCV2] fixes for non-Windows systems * [OpenCV2] add warnings for Ubuntu * add fixes for cuda * [OpenCV2] disable parallel building, otherwise cuda fails * [OpenCV2] refresh port with latest fixes * [OpenCV2] fix CONTROL * [OpenCV2] fixes for windows * [OpenCV2] fixes to avoid unnecessary install of pre-built ffmpeg, since it already uses externally provided one * [OpenCV2] openexr still has some problems, explicitly removed UWP support * [OpenCV2] use targets wherever possible. Jasper and OpenEXR features would require improvements in those ports, in order for them to provide targets too * [OpenCV2] re-enable parallel build also with CUDA * [OpenCV2] improve compatibility with CUDA 10+ * [OpenCV2] fix broken CUDA targets * [darknet] enable opencv2 feature * skip from building, like opencv3, to avoid problems in CI
13 lines
365 B
Diff
13 lines
365 B
Diff
--- a/modules/highgui/src/cap_ffmpeg_impl.hpp
|
|
+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp
|
|
@@ -42,6 +42,9 @@
|
|
|
|
#define HAVE_FFMPEG_SWSCALE
|
|
#define HAVE_GENTOO_FFMPEG
|
|
+#define AV_CODEC_FLAG_GLOBAL_HEADER (1 << 22)
|
|
+#define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER
|
|
+#define AVFMT_RAWPICTURE 0x0020
|
|
|
|
#include "cap_ffmpeg_api.hpp"
|
|
#include <assert.h>
|