From 98889e41b082dd4bee1d406093d2d8012d557cfd Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 14 Jan 2021 10:36:10 +0000 Subject: [PATCH] videoio: fix API/ABI_VERSION macros before plugin_api.hpp --- modules/videoio/src/cap_mfx_plugin.cpp | 3 +++ modules/videoio/src/videoio_registry.cpp | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/videoio/src/cap_mfx_plugin.cpp b/modules/videoio/src/cap_mfx_plugin.cpp index 846245faf0..d537963df9 100644 --- a/modules/videoio/src/cap_mfx_plugin.cpp +++ b/modules/videoio/src/cap_mfx_plugin.cpp @@ -7,6 +7,9 @@ #include #include "cap_mfx_reader.hpp" #include "cap_mfx_writer.hpp" + +#define ABI_VERSION 0 +#define API_VERSION 0 #include "plugin_api.hpp" using namespace std; diff --git a/modules/videoio/src/videoio_registry.cpp b/modules/videoio/src/videoio_registry.cpp index 3ee1bab822..3eaa00cc3a 100644 --- a/modules/videoio/src/videoio_registry.cpp +++ b/modules/videoio/src/videoio_registry.cpp @@ -16,8 +16,6 @@ #include "cap_mfx_writer.hpp" #endif -#include "plugin_api.hpp" - // All WinRT versions older than 8.0 should provide classes used for video support #if defined(WINRT) && !defined(WINRT_8_0) && defined(__cplusplus_winrt) # include "cap_winrt_capture.hpp"