From 460e9bf0af87c0df79e85c27eca68d4d4b5a1be4 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Sun, 25 Jun 2017 23:05:07 +0300 Subject: [PATCH] videoio: drop changes from legacy C-API header --- modules/videoio/include/opencv2/videoio.hpp | 2 +- modules/videoio/include/opencv2/videoio/videoio_c.h | 3 +-- modules/videoio/src/cap.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp index 13149cbf24..aa3f31a210 100644 --- a/modules/videoio/include/opencv2/videoio.hpp +++ b/modules/videoio/include/opencv2/videoio.hpp @@ -115,7 +115,7 @@ enum VideoCaptureAPIs { CAP_FFMPEG = 1900, //!< Open and record video file or stream using the FFMPEG library CAP_IMAGES = 2000, //!< OpenCV Image Sequence (e.g. img_%02d.jpg) CAP_ARAVIS = 2100, //!< Aravis SDK - CAP_OCV_MJPEG = 2200, //!< Built-in MotionJPEG codec + CAP_OPENCV_MJPEG = 2200, //!< Built-in OpenCV MotionJPEG codec CAP_INTEL_MFX = 2300 //!< Intel MediaSDK }; diff --git a/modules/videoio/include/opencv2/videoio/videoio_c.h b/modules/videoio/include/opencv2/videoio/videoio_c.h index 48581ddec4..024633c8b9 100644 --- a/modules/videoio/include/opencv2/videoio/videoio_c.h +++ b/modules/videoio/include/opencv2/videoio/videoio_c.h @@ -124,8 +124,7 @@ enum CV_CAP_FFMPEG = 1900, // FFMPEG CV_CAP_IMAGES = 2000, // OpenCV Image Sequence (e.g. img_%02d.jpg) - CV_CAP_ARAVIS = 2100, // Aravis GigE SDK - CV_CAP_OCV_MJPEG = 2200 // Built-in MotionJPEG codec + CV_CAP_ARAVIS = 2100 // Aravis GigE SDK }; /** @brief start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) diff --git a/modules/videoio/src/cap.cpp b/modules/videoio/src/cap.cpp index d3e4f94c6e..d4b49e9a0a 100644 --- a/modules/videoio/src/cap.cpp +++ b/modules/videoio/src/cap.cpp @@ -575,7 +575,7 @@ static Ptr IVideoWriter_create(const String& filename, int apiPref } #endif - if( (apiPreference == CAP_OCV_MJPEG || apiPreference == CAP_ANY) + if( (apiPreference == CAP_OPENCV_MJPEG || apiPreference == CAP_ANY) && _fourcc == CV_FOURCC('M', 'J', 'P', 'G') ) iwriter = createMotionJpegWriter(filename, fps, frameSize, isColor); -- GitLab