Merge pull request #19321 from alalek:fixup_19027

pull/19329/head
Alexander Alekhin 4 years ago
commit 63bb2abada
  1. 3
      modules/videoio/src/cap_mfx_plugin.cpp
  2. 2
      modules/videoio/src/videoio_registry.cpp

@ -7,6 +7,9 @@
#include <string> #include <string>
#include "cap_mfx_reader.hpp" #include "cap_mfx_reader.hpp"
#include "cap_mfx_writer.hpp" #include "cap_mfx_writer.hpp"
#define ABI_VERSION 0
#define API_VERSION 0
#include "plugin_api.hpp" #include "plugin_api.hpp"
using namespace std; using namespace std;

@ -16,8 +16,6 @@
#include "cap_mfx_writer.hpp" #include "cap_mfx_writer.hpp"
#endif #endif
#include "plugin_api.hpp"
// All WinRT versions older than 8.0 should provide classes used for video support // All WinRT versions older than 8.0 should provide classes used for video support
#if defined(WINRT) && !defined(WINRT_8_0) && defined(__cplusplus_winrt) #if defined(WINRT) && !defined(WINRT_8_0) && defined(__cplusplus_winrt)
# include "cap_winrt_capture.hpp" # include "cap_winrt_capture.hpp"

Loading…
Cancel
Save