mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-02 03:06:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

videoio: drop changes from legacy C-API header

Browse Source
This commit is contained in:
Alexander Alekhin 2017-06-25 23:05:07 +03:00
parent 23f4bff742
commit 460e9bf0af
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/videoio/include/opencv2/videoio.hpp
View File

@ -115,7 +115,7 @@ enum VideoCaptureAPIs {
CAP_FFMPEG = 1900, //!< Open and record video file or stream using the FFMPEG library 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_IMAGES = 2000, //!< OpenCV Image Sequence (e.g. img_%02d.jpg)
CAP_ARAVIS = 2100, //!< Aravis SDK 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 CAP_INTEL_MFX = 2300 //!< Intel MediaSDK
}; };

3
modules/videoio/include/opencv2/videoio/videoio_c.h
View File

@ -124,8 +124,7 @@ enum
CV_CAP_FFMPEG = 1900, // FFMPEG CV_CAP_FFMPEG = 1900, // FFMPEG
CV_CAP_IMAGES = 2000, // OpenCV Image Sequence (e.g. img_%02d.jpg) CV_CAP_IMAGES = 2000, // OpenCV Image Sequence (e.g. img_%02d.jpg)
CV_CAP_ARAVIS = 2100, // Aravis GigE SDK CV_CAP_ARAVIS = 2100 // Aravis GigE SDK
CV_CAP_OCV_MJPEG = 2200 // Built-in MotionJPEG codec
}; };
/** @brief start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*) /** @brief start capturing frames from camera: index = camera_index + domain_offset (CV_CAP_*)

2
modules/videoio/src/cap.cpp
View File

@ -575,7 +575,7 @@ static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int apiPref
} }
#endif #endif
if( (apiPreference == CAP_OCV_MJPEG || apiPreference == CAP_ANY) if( (apiPreference == CAP_OPENCV_MJPEG || apiPreference == CAP_ANY)
&& _fourcc == CV_FOURCC('M', 'J', 'P', 'G') ) && _fourcc == CV_FOURCC('M', 'J', 'P', 'G') )
iwriter = createMotionJpegWriter(filename, fps, frameSize, isColor); iwriter = createMotionJpegWriter(filename, fps, frameSize, isColor);