From 83723c15be910d41087627d0eeceacf393babda7 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Fri, 14 Nov 2014 14:09:43 +0100 Subject: [PATCH] added extra BUFFERSIZE doc and getter Conflicts: modules/highgui/doc/reading_and_writing_images_and_video.rst modules/highgui/src/cap_dc1394_v2.cpp --- modules/videoio/src/cap_dc1394_v2.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/videoio/src/cap_dc1394_v2.cpp b/modules/videoio/src/cap_dc1394_v2.cpp index 3dcd2041c..d120b5923 100644 --- a/modules/videoio/src/cap_dc1394_v2.cpp +++ b/modules/videoio/src/cap_dc1394_v2.cpp @@ -689,6 +689,8 @@ double CvCaptureCAM_DC1394_v2_CPP::getProperty(int propId) const break; case CV_CAP_PROP_ISO_SPEED: return (double) isoSpeed; + case CV_CAP_PROP_BUFFERSIZE: + return (double) nDMABufs; default: if (propId