Skip to content

O
opencv
Commit 544ceedc authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #16103 from alalek:videoio_ffmpeg_wrapper_version_check

parents 65d60663 e0e683ae
Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 3 deletions
modules/videoio/src/backend_plugin.cpp
View file @ 544ceedc
...@@ -208,10 +208,23 @@ public: ...@@ -208,10 +208,23 @@ public:
CV_LOG_INFO(NULL, "Video I/O: plugin is incompatible: " << lib->getName()); CV_LOG_INFO(NULL, "Video I/O: plugin is incompatible: " << lib->getName());
return; return;
} }
if (plugin_api_->api_header.opencv_version_major != CV_VERSION_MAJOR || if (plugin_api_->api_header.opencv_version_major != CV_VERSION_MAJOR)
plugin_api_->api_header.opencv_version_minor != CV_VERSION_MINOR)
{ {
CV_LOG_ERROR(NULL, "Video I/O: wrong OpenCV version used by plugin '" << plugin_api_->api_header.api_description << "': " << CV_LOG_ERROR(NULL, "Video I/O: wrong OpenCV major version used by plugin '" << plugin_api_->api_header.api_description << "': " <<
cv::format("%d.%d, OpenCV version is '" CV_VERSION "'", plugin_api_->api_header.opencv_version_major, plugin_api_->api_header.opencv_version_minor))
plugin_api_ = NULL;
return;
}
#ifdef HAVE_FFMPEG_WRAPPER
if (plugin_api_->captureAPI == CAP_FFMPEG)
{
// no checks for OpenCV minor version
}
else
#endif
if (plugin_api_->api_header.opencv_version_minor != CV_VERSION_MINOR)
{
CV_LOG_ERROR(NULL, "Video I/O: wrong OpenCV minor version used by plugin '" << plugin_api_->api_header.api_description << "': " <<
cv::format("%d.%d, OpenCV version is '" CV_VERSION "'", plugin_api_->api_header.opencv_version_major, plugin_api_->api_header.opencv_version_minor)) cv::format("%d.%d, OpenCV version is '" CV_VERSION "'", plugin_api_->api_header.opencv_version_major, plugin_api_->api_header.opencv_version_minor))
plugin_api_ = NULL; plugin_api_ = NULL;
return; return;
......
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