videoio: drop changes from legacy C-API header

alalek · alalek · commit 460e9bf0af87 · 2017-06-25T23:25:56.000+03:00
diff --git 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
@@ -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
@@ -575,7 +575,7 @@ static Ptr<IVideoWriter> 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);
 

Original file line number	Diff line number	Diff line change
`@@ -575,7 +575,7 @@ static Ptr<IVideoWriter> IVideoWriter_create(const String& filename, int apiPref`
`575`	`575`	`}`
`576`	`576`	`#endif`
`577`	`577`
`578`		`- if( (apiPreference == CAP_OCV_MJPEG \|\| apiPreference == CAP_ANY)`
	`578`	`+ if( (apiPreference == CAP_OPENCV_MJPEG \|\| apiPreference == CAP_ANY)`
`579`	`579`	`&& _fourcc == CV_FOURCC('M', 'J', 'P', 'G') )`
`580`	`580`	`iwriter = createMotionJpegWriter(filename, fps, frameSize, isColor);`
`581`	`581`